When dialogue goodbye is forced, allow using either the red link or the goodbye button

Fixes #1373
11 years ago · dcc0e2d105
parent 7c9c0830a9
commit dcc0e2d105
1 changed files with 3 additions and 2 deletions
--- 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 {