aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorMartin Kiewitz2010-07-03 06:55:10 +0000
committerMartin Kiewitz2010-07-03 06:55:10 +0000
commit42dfdea5df648cbf1a7778ac8848d752d0f144bb (patch)
tree841660d057af24fa6e21ad6ca4c4e97c1dd1a881 /engines
parent0fd3558986e7c0a0c08f3df18d6c8ce59da79110 (diff)
downloadscummvm-rg350-42dfdea5df648cbf1a7778ac8848d752d0f144bb.tar.gz
scummvm-rg350-42dfdea5df648cbf1a7778ac8848d752d0f144bb.tar.bz2
scummvm-rg350-42dfdea5df648cbf1a7778ac8848d752d0f144bb.zip
SCI: added resetting of SoundCommandParser, so that error()s before that one got initialized wont crash
svn-id: r50619
Diffstat (limited to 'engines')
-rw-r--r--engines/sci/sci.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp
index e9e16c8262..91eeac3a21 100644
--- a/engines/sci/sci.cpp
+++ b/engines/sci/sci.cpp
@@ -187,6 +187,9 @@ Common::Error SciEngine::run() {
}
*/
+ // Reset, so that error()s before SoundCommandParser is initialized wont cause a crash
+ _soundCmd = NULL;
+
// Add the after market GM patches for the specified game, if they exist
_resMan->addNewGMPatch(_gameId);
_gameObj = _resMan->findGameObject();