[Scummvm-cvs-logs] SF.net SVN: scummvm:[55355] scummvm/trunk/engines/gob/videoplayer.cpp

[drmccoy at users.sourceforge.net]

Revision: 55355
          http://scummvm.svn.sourceforge.net/scummvm/?rev=55355&view=rev
Author:   drmccoy
Date:     2011-01-20 17:06:50 +0000 (Thu, 20 Jan 2011)

Log Message:
-----------
GOB: Don't temper with the break key for live videos

Modified Paths:
--------------
    scummvm/trunk/engines/gob/videoplayer.cpp

Modified: scummvm/trunk/engines/gob/videoplayer.cpp
===================================================================
--- scummvm/trunk/engines/gob/videoplayer.cpp	2011-01-20 15:29:32 UTC (rev 55354)
+++ scummvm/trunk/engines/gob/videoplayer.cpp	2011-01-20 17:06:50 UTC (rev 55355)
@@ -231,9 +231,6 @@
 
 	bool primary = slot == 0;
 
-	// NOTE: For testing (and comfort?) purposes, we enable aborting of all videos)
-	properties.breakKey = kShortKeyEscape;
-
 	if (properties.startFrame < 0)
 		properties.startFrame = video->decoder->getCurFrame() + 1;
 	if (properties.lastFrame  < 0)
@@ -266,6 +263,9 @@
 		return true;
 	}
 
+	// NOTE: For testing (and comfort?) purposes, we enable aborting of all videos)
+	properties.breakKey = kShortKeyEscape;
+
 	while ((properties.startFrame != properties.lastFrame) &&
 	       (properties.startFrame < (int32)(video->decoder->getFrameCount() - 1))) {
 


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