diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp index 1b271dfd52..b35b3c92cc 100644 --- a/apps/openmw/mwgui/windowmanagerimp.cpp +++ b/apps/openmw/mwgui/windowmanagerimp.cpp @@ -1268,6 +1268,8 @@ namespace MWGui if (mode==GM_Inventory && mAllowed==GW_None) return; + for (WindowBase* window : mGuiModeStates[mode].mWindows) + window->setPtr(arg); if (mGuiModes.empty() || mGuiModes.back() != mode) { // 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); playSound(mGuiModeStates[mode].mOpenSound); } - for (WindowBase* window : mGuiModeStates[mode].mWindows) - window->setPtr(arg); mKeyboardNavigation->restoreFocus(mode);