[Scummvm-cvs-logs] SF.net SVN: scummvm: [28163] scummvm/trunk/sound/mixer.cpp

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Sun Jul 22 13:54:35 CEST 2007


Revision: 28163
          http://scummvm.svn.sourceforge.net/scummvm/?rev=28163&view=rev
Author:   fingolfin
Date:     2007-07-22 04:54:35 -0700 (Sun, 22 Jul 2007)

Log Message:
-----------
Don't be so strict about un-pausing sounds which are not paused currently

Modified Paths:
--------------
    scummvm/trunk/sound/mixer.cpp

Modified: scummvm/trunk/sound/mixer.cpp
===================================================================
--- scummvm/trunk/sound/mixer.cpp	2007-07-22 09:17:23 UTC (rev 28162)
+++ scummvm/trunk/sound/mixer.cpp	2007-07-22 11:54:35 UTC (rev 28163)
@@ -77,11 +77,11 @@
 		return _input->endOfStream();
 	}
 	void pause(bool paused) {
-		assert((paused && _pauseLevel >= 0) || (!paused && _pauseLevel));
+		//assert((paused && _pauseLevel >= 0) || (!paused && _pauseLevel));
 	
 		if (paused)
 			_pauseLevel++;
-		else
+		else if (_pauseLevel > 0)
 			_pauseLevel--;
 	}
 	bool isPaused() {


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




More information about the Scummvm-git-logs mailing list