From 94093895bcead9cd7850e497e96626b090143ecd Mon Sep 17 00:00:00 2001 From: Jaka Kranjc Date: Wed, 11 May 2016 20:25:44 +0200 Subject: [PATCH] CloseContainerWindow: resolved iwd2 fixme --- gemrb/GUIScripts/CommonWindow.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/gemrb/GUIScripts/CommonWindow.py b/gemrb/GUIScripts/CommonWindow.py index e42605af46..af4e8b06d5 100644 --- a/gemrb/GUIScripts/CommonWindow.py +++ b/gemrb/GUIScripts/CommonWindow.py @@ -282,12 +282,10 @@ def CloseContainerWindow (): GUICommonWindows.ActionsWindow.SetVisible(WINDOW_VISIBLE) - # FIXME: iwd2 bug or just bad naming? - if GameCheck.IsIWD2(): - GemRB.SetVar ("MessageWindow", GUIWORLD.OldMessageWindow.ID) - else: + GemRB.SetVar ("MessageWindow", GUIWORLD.OldMessageWindow.ID) + # iwd2 has no separate action window + if not GameCheck.IsIWD2(): GemRB.SetVar ("ActionsWindow", GUIWORLD.OldActionsWindow.ID) - GemRB.SetVar ("MessageWindow", GUIWORLD.OldMessageWindow.ID) Table = GemRB.LoadTable ("containr") row = Container['Type']