From dcc0e2d1054178aea10ee51d151b1c4200c13af4 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 1 Jun 2014 00:21:14 +0200
Subject: [PATCH] When dialogue goodbye is forced, allow using either the red
 link or the goodbye button

Fixes #1373
---
 apps/openmw/mwgui/dialogue.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwgui/dialogue.cpp b/apps/openmw/mwgui/dialogue.cpp
index 5e3f93ab9..441e31e32 100644
--- a/apps/openmw/mwgui/dialogue.cpp
+++ b/apps/openmw/mwgui/dialogue.cpp
@@ -271,7 +271,8 @@ namespace MWGui
 
     void DialogueWindow::exit()
     {
-        if (!mEnabled || MWBase::Environment::get().getDialogueManager()->isInChoice())
+        if ((!mEnabled || MWBase::Environment::get().getDialogueManager()->isInChoice())
+                && !mGoodbye)
             return;
         MWBase::Environment::get().getDialogueManager()->goodbyeSelected();
     }
@@ -517,7 +518,7 @@ namespace MWGui
 
         MyGUI::Button* byeButton;
         getWidget(byeButton, "ByeButton");
-        if(MWBase::Environment::get().getDialogueManager()->isInChoice()) {
+        if(MWBase::Environment::get().getDialogueManager()->isInChoice() && !mGoodbye) {
             byeButton->setEnabled(false);
         }
         else {