From f34e35eb19ff19cbb9d89c4f404489fa66de2d22 Mon Sep 17 00:00:00 2001 From: Allofich Date: Sat, 22 Apr 2017 07:34:08 +0900 Subject: [PATCH] Check for NULL before running voice scripts (Fixes #3834) --- apps/openmw/mwdialogue/dialoguemanagerimp.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp index 489d726e6..c853efad2 100644 --- 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