Merge pull request #1270 from Allofich/scriptfix

Check for NULL before running voice dialogue scripts
8 years ago · 0737d6cb72
parent 8fbf9dc597 f34e35eb19
commit 0737d6cb72
1 changed files with 2 additions and 3 deletions
--- a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
+++ b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
@ -646,10 +646,9 @@ namespace MWDialogue
                winMgr->messageBox(info->mResponse);
            if (!info->mSound.empty())
                sndMgr->say(actor, info->mSound);
+            if (!info->mResultScript.empty())
+                executeScript(info->mResultScript, actor);
        }
-
-        if (!info->mResultScript.empty())
-            executeScript(info->mResultScript, actor);
    }

    int DialogueManager::countSavedGameRecords() const