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

4 months ago · 2ea9d6ba20
parent 6b762a5328
commit 2ea9d6ba20
1 changed files with 6 additions and 3 deletions
--- 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())