[Scummvm-cvs-logs] SF.net SVN: scummvm:[51517] scummvm/trunk/graphics/video/video_decoder.cpp

[salty-horse at users.sourceforge.net]

Revision: 51517
          http://scummvm.svn.sourceforge.net/scummvm/?rev=51517&view=rev
Author:   salty-horse
Date:     2010-07-30 21:07:27 +0000 (Fri, 30 Jul 2010)

Log Message:
-----------
VIDEO: Ignore requests to unpause when video is already unpaused

Previous behavior was to assert

Modified Paths:
--------------
    scummvm/trunk/graphics/video/video_decoder.cpp

Modified: scummvm/trunk/graphics/video/video_decoder.cpp
===================================================================
--- scummvm/trunk/graphics/video/video_decoder.cpp	2010-07-30 20:35:09 UTC (rev 51516)
+++ scummvm/trunk/graphics/video/video_decoder.cpp	2010-07-30 21:07:27 UTC (rev 51517)
@@ -81,9 +81,14 @@
 void VideoDecoder::pauseVideo(bool pause) {
 	if (pause) {
 		_pauseLevel++;
+
+	// We can't go negative
+	} else if (_pauseLevel) {
+		_pauseLevel--;
+
+	// Do nothing
 	} else {
-		assert(_pauseLevel); // We can't go negative
-		_pauseLevel--;
+		return;
 	}
 
 	if (_pauseLevel == 1 && pause) {


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