From 1a354f88acace854cc7cbb6c04e0cf8c57cce4fc Mon Sep 17 00:00:00 2001
From: Capostrophic <Capostrophic@users.noreply.github.com>
Date: Thu, 7 Jun 2018 22:05:55 +0300
Subject: [PATCH] Make choices trigger goodbye if Goodbye is used (fixes #3897)

---
 CHANGELOG.md                   | 1 +
 apps/openmw/mwgui/dialogue.cpp | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8cbef559d8..0fbc5092f7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 0.45.0
 ------
+    Feature #3897: Have Goodbye give all choices the effects of Goodbye
     Bug #4293: Faction members are not aware of faction ownerships in barter
     Bug #4426: RotateWorld behavior is incorrect
     Bug #4433: Guard behaviour is incorrect with Alarm = 0
diff --git a/apps/openmw/mwgui/dialogue.cpp b/apps/openmw/mwgui/dialogue.cpp
index 14bbe81ef6..450799f29b 100644
--- a/apps/openmw/mwgui/dialogue.cpp
+++ b/apps/openmw/mwgui/dialogue.cpp
@@ -635,6 +635,11 @@ namespace MWGui
 
     void DialogueWindow::onChoiceActivated(int id)
     {
+        if (mGoodbye)
+        {
+            onGoodbyeActivated();
+            return;
+        }
         MWBase::Environment::get().getDialogueManager()->questionAnswered(id, mCallback.get());
         updateTopics();
     }