mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-21 18:09:39 +00:00
Code Issues Releases Wiki Activity

Correct odd toggling menu behavior.

Browse source
This commit is contained in:
Perry Hugh 2019-03-05 14:39:40 -08:00 committed by Bret Curtis
parent 088de40365
commit b8b7568ce5
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
apps/openmw/mwinput/inputmanagerimp.cpp
View file

@ -1146,12 +1146,21 @@ namespace MWInput
bool state = MWBase::Environment::get().getStateManager()->getState() == MWBase::StateManager::State_NoGame; bool state = MWBase::Environment::get().getStateManager()->getState() == MWBase::StateManager::State_NoGame;
MWGui::GuiMode mode = MWBase::Environment::get().getWindowManager()->getMode(); MWGui::GuiMode mode = MWBase::Environment::get().getWindowManager()->getMode();
if (mode == MWGui::GM_Settings || (!state && mode == MWGui::GM_MainMenu)) if (mode == MWGui::GM_MainMenu)
{ {
if (MyGUI::InputManager::getInstance().isModalAny()) if (MyGUI::InputManager::getInstance().isModalAny())
MWBase::Environment::get().getWindowManager()->exitCurrentModal(); {
MWBase::Environment::get().getWindowManager()->popGuiMode(); while (MyGUI::InputManager::getInstance().isModalAny())
{
MWBase::Environment::get().getWindowManager()->exitCurrentModal();
}
}
else if (!state)
MWBase::Environment::get().getWindowManager()->popGuiMode();
} }
else if (mode == MWGui::GM_Settings)
MWBase::Environment::get().getWindowManager()->popGuiMode();
if(state || mode == MWGui::GM_MainMenu) if(state || mode == MWGui::GM_MainMenu)
return; return;