krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

Fix exception closing container window

Browse source
This commit is contained in:
scrawl 2014-01-07 18:11:19 +01:00
parent d97615d5d8
commit c4ab2f417a
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/openmw/mwgui/container.cpp
View file

@ -242,9 +242,11 @@ namespace MWGui
{ {
WindowBase::close(); WindowBase::close();
// Make sure we were actually closed, rather than just temporarily hidden (e.g. console or main menu opened) if (dynamic_cast<PickpocketItemModel*>(mModel)
if (!MWBase::Environment::get().getWindowManager()->containsMode(GM_Container) // Make sure we were actually closed, rather than just temporarily hidden (e.g. console or main menu opened)
&& !mPickpocketDetected // If it was already detected while taking an item, no need to check now && !MWBase::Environment::get().getWindowManager()->containsMode(GM_Container)
// If it was already detected while taking an item, no need to check now
&& !mPickpocketDetected
) )
{ {
MWMechanics::Pickpocket pickpocket(MWBase::Environment::get().getWorld()->getPlayer().getPlayer(), MWMechanics::Pickpocket pickpocket(MWBase::Environment::get().getWorld()->getPlayer().getPlayer(),