AnarchistGamers/TES3MP
1
0
Fork 0
mirror of https://github.com/TES3MP/TES3MP.git synced 2025-09-24 05:00:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'onclose' into 'master'

Browse Source 
Don't reset temporarily hidden container window

Closes #5658

See merge request OpenMW/openmw!363
This commit is contained in:
psi29a 2020-10-22 07:11:31 +00:00
commit 916c3bed98
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/openmw/mwgui/container.cpp
View File

@ -163,6 +163,10 @@ namespace MWGui
{ {
WindowBase::onClose(); WindowBase::onClose();
// Make sure the window was actually closed and not temporarily hidden.
if (MWBase::Environment::get().getWindowManager()->containsMode(GM_Container))
return;
if (mModel) if (mModel)
mModel->onClose(); mModel->onClose();
@ -185,6 +189,7 @@ namespace MWGui
// transfer everything into the player's inventory // transfer everything into the player's inventory
ItemModel* playerModel = MWBase::Environment::get().getWindowManager()->getInventoryWindow()->getModel(); ItemModel* playerModel = MWBase::Environment::get().getWindowManager()->getInventoryWindow()->getModel();
assert(mModel);
mModel->update(); mModel->update();
// unequip all items to avoid unequipping/reequipping // unequip all items to avoid unequipping/reequipping