Fix UB in item view controller refocusing during redraw

Capostrophic · Capostrophic · commit c3f7c0324931 · 2025-10-18T18:56:36.000+03:00
See merge request OpenMW/openmw!4948 (cherry-picked from 081cf2c)
diff --git a/apps/openmw/mwgui/itemview.cpp b/apps/openmw/mwgui/itemview.cpp
@@ -82,7 +82,9 @@ namespace MWGui
 
         if (Settings::gui().mControllerMenus)
         {
-            mControllerFocus = std::clamp(mControllerFocus, 0, mItemCount - 1);
+            mControllerFocus = -1;
+            if (mItemCount > 0)
+                mControllerFocus = std::clamp(mControllerFocus, 0, mItemCount - 1);
             updateControllerFocus(-1, mControllerFocus);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,9 @@ namespace MWGui`
`82`	`82`
`83`	`83`	`if (Settings::gui().mControllerMenus)`
`84`	`84`	`{`
`85`		`- mControllerFocus = std::clamp(mControllerFocus, 0, mItemCount - 1);`
	`85`	`+ mControllerFocus = -1;`
	`86`	`+ if (mItemCount > 0)`
	`87`	`+ mControllerFocus = std::clamp(mControllerFocus, 0, mItemCount - 1);`
`86`	`88`	`updateControllerFocus(-1, mControllerFocus);`
`87`	`89`	`}`
`88`	`90`