Merged pull request #1738

CHANGELOG.md

@@ -6,6 +6,7 @@
     Bug #4327: Missing animations during spell/weapon stance switching
     Bug #4426: RotateWorld behavior is incorrect
     Bug #4433: Guard behaviour is incorrect with Alarm = 0
+    Bug #4443: Goodbye option and dialogue choices are not mutually exclusive 
     Feature #4444: Per-group KF-animation files support
 
 0.44.0

apps/openmw/mwdialogue/dialoguemanagerimp.cpp

@@ -431,9 +431,11 @@ namespace MWDialogue
 
     void DialogueManager::addChoice (const std::string& text, int choice)
     {
-        mIsInChoice = true;
-
-        mChoices.push_back(std::make_pair(text, choice));
+        if (!mGoodbye)
+        {
+            mIsInChoice = true;
+            mChoices.push_back(std::make_pair(text, choice));
+        }
     }
 
     const std::vector<std::pair<std::string, int> >& DialogueManager::getChoices()
@@ -448,8 +450,8 @@ namespace MWDialogue
 
     void DialogueManager::goodbye()
     {
-        mIsInChoice = false;
-        mGoodbye = true;
+        if (!mIsInChoice)
+            mGoodbye = true;
     }
 
     void DialogueManager::persuade(int type, ResponseCallback* callback)