[Scummvm-cvs-logs] SF.net SVN: scummvm: [21099] scummvm/trunk/engines/scumm/scumm.cpp

eriktorbjorn at users.sourceforge.net eriktorbjorn at users.sourceforge.net
Sun Mar 5 16:38:56 CET 2006


Revision: 21099
Author:   eriktorbjorn
Date:     2006-03-05 05:57:05 -0800 (Sun, 05 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm?rev=21099&view=rev

Log Message:
-----------
Make sure there actually is a SMUSH mixer before stopping and deleting it.

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/scumm.cpp
Modified: scummvm/trunk/engines/scumm/scumm.cpp
===================================================================
--- scummvm/trunk/engines/scumm/scumm.cpp	2006-03-05 13:43:50 UTC (rev 21098)
+++ scummvm/trunk/engines/scumm/scumm.cpp	2006-03-05 13:57:05 UTC (rev 21099)
@@ -935,8 +935,10 @@
 	}
 
 #ifndef DISABLE_SCUMM_7_8
-	_smixer->stop();
-	delete _smixer;
+	if (_smixer) {
+		_smixer->stop();
+		delete _smixer;
+	}
 #endif
 	_mixer->stopAll();
 







More information about the Scummvm-git-logs mailing list