Removes add behavior when pressing escape while waiting.

apps/openmw/mwgui/waitdialog.cpp

@@ -71,6 +71,7 @@ namespace MWGui
 
     void WaitDialog::exit()
     {
+        if(!mProgressBar.isVisible()) //Only exit if not currently waiting
             MWBase::Environment::get().getWindowManager()->popGuiMode();
     }
 

apps/openmw/mwgui/windowbase.cpp

@@ -23,6 +23,11 @@ void WindowBase::setVisible(bool visible)
         close();
 }
 
+bool WindowBase::isVisible()
+{
+    return mMainWidget->getVisible();
+}
+
 void WindowBase::center()
 {
     // Centre dialog

apps/openmw/mwgui/windowbase.hpp

@@ -29,6 +29,8 @@ namespace MWGui
         virtual void exit() {}
         ///Sets the visibility of the window
         virtual void setVisible(bool visible);
+        ///Returns the visibility state of the window
+        virtual bool isVisible();
         void center();
 
         /** Event : Dialog finished, OK button clicked.\n