[Scummvm-cvs-logs] SF.net SVN: scummvm:[45231] scummvm/trunk/engines/sci/sfx/core.cpp

[thebluegr at users.sourceforge.net]

Revision: 45231
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45231&view=rev
Author:   thebluegr
Date:     2009-10-18 19:07:22 +0000 (Sun, 18 Oct 2009)

Log Message:
-----------
Mark an old change made for SQ4 in updateMultiSong() in rev. #39347 as a workaround

Modified Paths:
--------------
    scummvm/trunk/engines/sci/sfx/core.cpp

Modified: scummvm/trunk/engines/sci/sfx/core.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/core.cpp	2009-10-18 18:47:53 UTC (rev 45230)
+++ scummvm/trunk/engines/sci/sfx/core.cpp	2009-10-18 19:07:22 UTC (rev 45231)
@@ -553,6 +553,8 @@
 	/*	_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;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.