Merge branch 'doubleexit' into 'master'

psi29a · psi29a · commit 241a24564ab1 · 2025-03-18T13:16:23.000Z
Don't assume there is a GUI mode in exitCurrentGuiMode (#8380)

Closes #8380

See merge request OpenMW/openmw!4590
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -729,6 +729,9 @@ namespace MWGui
             return;
         }
 
+        if (mGuiModes.empty())
+            return;
+
         GuiModeState& state = mGuiModeStates[mGuiModes.back()];
         for (const auto& window : state.mWindows)
         {

Original file line number	Diff line number	Diff line change
`@@ -729,6 +729,9 @@ namespace MWGui`
`729`	`729`	`return;`
`730`	`730`	`}`
`731`	`731`
	`732`	`+ if (mGuiModes.empty())`
	`733`	`+ return;`
	`734`	`+`
`732`	`735`	`GuiModeState& state = mGuiModeStates[mGuiModes.back()];`
`733`	`736`	`for (const auto& window : state.mWindows)`
`734`	`737`	`{`