mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-25 12:41:01 +00:00
Code Issues Projects Releases Wiki Activity

Make sure pointers are set before GUI windows are brought up

Browse Source 
This most noticiably fixes an issue when resting in a bed while levitating.
This commit is contained in:
Phillip Andrews 2019-05-06 14:53:20 -05:00
parent f49ca98c8c
commit a481d2dc1a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/openmw/mwgui/windowmanagerimp.cpp
View File

@ -1268,6 +1268,8 @@ namespace MWGui
if (mode==GM_Inventory && mAllowed==GW_None) if (mode==GM_Inventory && mAllowed==GW_None)
return; return;
for (WindowBase* window : mGuiModeStates[mode].mWindows)
window->setPtr(arg);
if (mGuiModes.empty() || mGuiModes.back() != mode) if (mGuiModes.empty() || mGuiModes.back() != mode)
{ {
// If this mode already exists somewhere in the stack, just bring it to the front. // If this mode already exists somewhere in the stack, just bring it to the front.
@ -1286,8 +1288,6 @@ namespace MWGui
mGuiModeStates[mode].update(true); mGuiModeStates[mode].update(true);
playSound(mGuiModeStates[mode].mOpenSound); playSound(mGuiModeStates[mode].mOpenSound);
} }
for (WindowBase* window : mGuiModeStates[mode].mWindows)
window->setPtr(arg);
mKeyboardNavigation->restoreFocus(mode); mKeyboardNavigation->restoreFocus(mode);