Fix not being able to exit dialogue using Escape when a Goodbye link appears

apps/openmw/mwdialogue/dialoguemanagerimp.cpp

@@ -505,9 +505,10 @@ namespace MWDialogue
 
     void DialogueManager::askQuestion (const std::string& question, int choice)
     {
+        mIsInChoice = true;
+
         MWGui::DialogueWindow* win = MWBase::Environment::get().getWindowManager()->getDialogueWindow();
         win->addChoice(question, choice);
-        mIsInChoice = true;
     }
 
     void DialogueManager::goodbye()

apps/openmw/mwgui/dialogue.cpp

@@ -273,8 +273,13 @@ namespace MWGui
     {
         if ((!mEnabled || MWBase::Environment::get().getDialogueManager()->isInChoice())
                 && !mGoodbye)
-            return;
-        MWBase::Environment::get().getDialogueManager()->goodbyeSelected();
+        {
+            // in choice, not allowed to escape, but give access to main menu to allow loading other saves
+            MWBase::Environment::get().getWindowManager()->pushGuiMode (MWGui::GM_MainMenu);
+            MWBase::Environment::get().getSoundManager()->pauseSounds (MWBase::SoundManager::Play_TypeSfx);
+        }
+        else
+            MWBase::Environment::get().getDialogueManager()->goodbyeSelected();
     }
 
     void DialogueWindow::onWindowResize(MyGUI::Window* _sender)

apps/openmw/mwinput/inputmanagerimp.cpp

@@ -686,14 +686,6 @@ namespace MWInput
             return;
         }
 
-        if(MWBase::Environment::get().getWindowManager()->getMode() == MWGui::GM_Dialogue) { //Give access to the main menu when at a choice in dialogue
-            if(MWBase::Environment::get().getDialogueManager()->isInChoice()) {
-                MWBase::Environment::get().getWindowManager()->pushGuiMode (MWGui::GM_MainMenu);
-                MWBase::Environment::get().getSoundManager()->pauseSounds (MWBase::SoundManager::Play_TypeSfx);
-                return;
-            }
-        }
-
         if(!MWBase::Environment::get().getWindowManager()->isGuiMode()) //No open GUIs, open up the MainMenu
         {
             MWBase::Environment::get().getWindowManager()->pushGuiMode (MWGui::GM_MainMenu);