aboutsummaryrefslogtreecommitdiff
path: root/engines/sci
diff options
context:
space:
mode:
authorFilippos Karapetis2009-10-18 19:07:22 +0000
committerFilippos Karapetis2009-10-18 19:07:22 +0000
commit32810a30b575d7c11bd0f409d0c09549e53e5437 (patch)
treeed2d232264ba1b65d4a2947effedefd1ac0e388d /engines/sci
parentc8853f0cc0bf9ce0423a8edbc79ba5bfd32d1a01 (diff)
downloadscummvm-rg350-32810a30b575d7c11bd0f409d0c09549e53e5437.tar.gz
scummvm-rg350-32810a30b575d7c11bd0f409d0c09549e53e5437.tar.bz2
scummvm-rg350-32810a30b575d7c11bd0f409d0c09549e53e5437.zip
Mark an old change made for SQ4 in updateMultiSong() in rev. #39347 as a workaround
svn-id: r45231
Diffstat (limited to 'engines/sci')
-rw-r--r--engines/sci/sfx/core.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/engines/sci/sfx/core.cpp b/engines/sci/sfx/core.cpp
index 1831ae14fc..e29560ba35 100644
--- a/engines/sci/sfx/core.cpp
+++ b/engines/sci/sfx/core.cpp
@@ -553,6 +553,8 @@ void SfxState::updateMultiSong() {
/* _dump_playing_list(this, "before");*/
freezeTime(); /* Store song delay time */
+ // WORKAROUND: sometimes, newsong can be NULL (e.g. in SQ4).
+ // Handle this here, so that we avoid a crash
if (!newsong)
return;