FIX(windowmanagerimp): Don't remove a ui mode twice

OpenMW · Sep 11, 2024 · 2ea9d6b · 2ea9d6b
1 parent 6b762a5
commit 2ea9d6b
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -1323,9 +1323,12 @@ namespace MWGui
                     window->exit();
             }
             mKeyboardNavigation->saveFocus(mode);
-            mGuiModes.pop_back();
-            mGuiModeStates[mode].update(false);
-            MWBase::Environment::get().getLuaManager()->uiModeChanged(MWWorld::Ptr());
+            if (containsMode(mode))
+            {
+                mGuiModes.pop_back();
+                mGuiModeStates[mode].update(false);
+                MWBase::Environment::get().getLuaManager()->uiModeChanged(MWWorld::Ptr());
+            }
         }
 
         if (!mGuiModes.empty())