From c3f7c0324931f27fb64ef8face0c3939fd81bdca Mon Sep 17 00:00:00 2001
From: Alexei Kotov <alexdobrohotov@yandex.ru>
Date: Sat, 18 Oct 2025 18:55:03 +0300
Subject: [PATCH] Fix UB in item view controller refocusing during redraw

See merge request OpenMW/openmw!4948

(cherry-picked from 081cf2cf253)
---
 apps/openmw/mwgui/itemview.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwgui/itemview.cpp b/apps/openmw/mwgui/itemview.cpp
index 89d764c845..ae295cd4ea 100644
--- 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);
         }