mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-20 02:53:51 +00:00
Code Issues Releases Wiki Activity

Merge branch 'ptr-fix' into 'master'

Browse source 
Make sure pointers are set before GUI windows are brought up

See merge request OpenMW/openmw!103
This commit is contained in:
Alexei Dobrohotov 2019-05-06 20:33:25 +00:00
commit 310e19d47f
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);