Merge branch 'actually-you-have-to-sleep' into 'master'

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

Closes #8156

See merge request OpenMW/openmw!4369
This commit is contained in:
Evil Eye 2024-09-13 07:17:49 +00:00
commit dac6779aaf

View File

@ -1323,10 +1323,13 @@ namespace MWGui
window->exit(); window->exit();
} }
mKeyboardNavigation->saveFocus(mode); mKeyboardNavigation->saveFocus(mode);
if (containsMode(mode))
{
mGuiModes.pop_back(); mGuiModes.pop_back();
mGuiModeStates[mode].update(false); mGuiModeStates[mode].update(false);
MWBase::Environment::get().getLuaManager()->uiModeChanged(MWWorld::Ptr()); MWBase::Environment::get().getLuaManager()->uiModeChanged(MWWorld::Ptr());
} }
}
if (!mGuiModes.empty()) if (!mGuiModes.empty())
{ {