From 8103d25b09710f1d4fa7d7bec727d0bec60ece93 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 1 Dec 2014 14:48:53 +0100
Subject: [PATCH] Make ToggleMenus close open windows (Fixes #2045)

---
 apps/openmw/mwscript/guiextensions.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/apps/openmw/mwscript/guiextensions.cpp b/apps/openmw/mwscript/guiextensions.cpp
index afc745beb..1d34adbca 100644
--- a/apps/openmw/mwscript/guiextensions.cpp
+++ b/apps/openmw/mwscript/guiextensions.cpp
@@ -210,6 +210,12 @@ namespace MWScript
             {
                 bool state = MWBase::Environment::get().getWindowManager()->toggleGui();
                 runtime.getContext().report(state ? "GUI -> On" : "GUI -> Off");
+
+                if (!state)
+                {
+                    while (MWBase::Environment::get().getWindowManager()->getMode() != MWGui::GM_None) // don't use isGuiMode, or we get an infinite loop for modal message boxes!
+                        MWBase::Environment::get().getWindowManager()->popGuiMode();
+                }
             }
         };