From 6381b1e9381436a22c8a3af212bd4b4145607529 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 2 May 2014 11:20:43 +0200
Subject: [PATCH] Fixes #1309: Do not allow saving while dialogs are opened,
 just like vanilla

This limitation could be removed post-1.0 by serializing the state of open windows.
---
 apps/openmw/mwbase/windowmanager.hpp     |  3 +++
 apps/openmw/mwgui/mainmenu.cpp           |  3 ++-
 apps/openmw/mwgui/referenceinterface.hpp |  2 ++
 apps/openmw/mwgui/windowmanagerimp.cpp   | 20 ++++++++++++++++++++
 apps/openmw/mwgui/windowmanagerimp.hpp   |  3 +++
 apps/openmw/mwstate/statemanagerimp.cpp  |  5 +++--
 6 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwbase/windowmanager.hpp b/apps/openmw/mwbase/windowmanager.hpp
index c78902a60a..9e5230af62 100644
--- a/apps/openmw/mwbase/windowmanager.hpp
+++ b/apps/openmw/mwbase/windowmanager.hpp
@@ -306,6 +306,9 @@ namespace MWBase
             virtual void write (ESM::ESMWriter& writer, Loading::Listener& progress) = 0;
             virtual void readRecord (ESM::ESMReader& reader, int32_t type) = 0;
             virtual int countSavedGameRecords() const = 0;
+
+            /// Does the current stack of GUI-windows permit saving?
+            virtual bool isSavingAllowed() const = 0;
     };
 }
 
diff --git a/apps/openmw/mwgui/mainmenu.cpp b/apps/openmw/mwgui/mainmenu.cpp
index df9c53ea87..8b44af2ef3 100644
--- a/apps/openmw/mwgui/mainmenu.cpp
+++ b/apps/openmw/mwgui/mainmenu.cpp
@@ -170,7 +170,8 @@ namespace MWGui
             buttons.push_back("loadgame");
 
         if (state==MWBase::StateManager::State_Running &&
-            MWBase::Environment::get().getWorld()->getGlobalInt ("chargenstate")==-1)
+            MWBase::Environment::get().getWorld()->getGlobalInt ("chargenstate")==-1 &&
+                MWBase::Environment::get().getWindowManager()->isSavingAllowed())
             buttons.push_back("savegame");
 
         buttons.push_back("options");
diff --git a/apps/openmw/mwgui/referenceinterface.hpp b/apps/openmw/mwgui/referenceinterface.hpp
index 39574d0f7a..df53a42b70 100644
--- a/apps/openmw/mwgui/referenceinterface.hpp
+++ b/apps/openmw/mwgui/referenceinterface.hpp
@@ -17,6 +17,8 @@ namespace MWGui
 
         void checkReferenceAvailable(); ///< closes the window, if the MW-reference has become unavailable
 
+        void resetReference() { mPtr = MWWorld::Ptr(); mCurrentPlayerCell = NULL; }
+
     protected:
         virtual void onReferenceUnavailable() = 0; ///< called when reference has become unavailable
 
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index 1b4145e5c3..d2a31e8d15 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -1406,6 +1406,19 @@ namespace MWGui
     {
         mMap->clear();
         mQuickKeysMenu->clear();
+
+        mTrainingWindow->resetReference();
+        mDialogueWindow->resetReference();
+        mTradeWindow->resetReference();
+        mSpellBuyingWindow->resetReference();
+        mSpellCreationDialog->resetReference();
+        mEnchantingDialog->resetReference();
+        mContainerWindow->resetReference();
+        mCompanionWindow->resetReference();
+        mConsole->resetReference();
+
+        mGuiModes.clear();
+        updateVisible();
     }
 
     void WindowManager::write(ESM::ESMWriter &writer, Loading::Listener& progress)
@@ -1430,6 +1443,13 @@ namespace MWGui
                 + 1; // QuickKeysMenu
     }
 
+    bool WindowManager::isSavingAllowed() const
+    {
+        return !MyGUI::InputManager::getInstance().isModalAny()
+                // TODO: remove this, once we have properly serialized the state of open windows
+                && (!isGuiMode() || (mGuiModes.size() == 1 && getMode() == GM_MainMenu));
+    }
+
     void WindowManager::playVideo(const std::string &name, bool allowSkipping)
     {
         mVideoWidget->playVideo("video\\" + name, allowSkipping);
diff --git a/apps/openmw/mwgui/windowmanagerimp.hpp b/apps/openmw/mwgui/windowmanagerimp.hpp
index 44bc566546..e31013b451 100644
--- a/apps/openmw/mwgui/windowmanagerimp.hpp
+++ b/apps/openmw/mwgui/windowmanagerimp.hpp
@@ -295,6 +295,9 @@ namespace MWGui
     virtual void readRecord (ESM::ESMReader& reader, int32_t type);
     virtual int countSavedGameRecords() const;
 
+    /// Does the current stack of GUI-windows permit saving?
+    virtual bool isSavingAllowed() const;
+
   private:
     bool mConsoleOnlyScripts;
 
diff --git a/apps/openmw/mwstate/statemanagerimp.cpp b/apps/openmw/mwstate/statemanagerimp.cpp
index 48d12f0a6d..c718eeced7 100644
--- a/apps/openmw/mwstate/statemanagerimp.cpp
+++ b/apps/openmw/mwstate/statemanagerimp.cpp
@@ -235,8 +235,9 @@ void MWState::StateManager::saveGame (const std::string& description, const Slot
 
 void MWState::StateManager::quickSave (std::string name)
 {
-    if (mState!=State_Running ||
-        MWBase::Environment::get().getWorld()->getGlobalInt ("chargenstate")!=-1) // char gen
+    if (!(mState==State_Running &&
+        MWBase::Environment::get().getWorld()->getGlobalInt ("chargenstate")==-1 // char gen
+            && MWBase::Environment::get().getWindowManager()->isSavingAllowed()))
     {
         //You can not save your game right now
         MWBase::Environment::get().getWindowManager()->messageBox("#{sSaveGameDenied}");