[Scummvm-cvs-logs] scummvm master -> ad632d88d92a31d11d96651c58f3ec0fe8544812

[clone2727]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
ad632d88d9 PEGASUS: Fix movie pause/resume


Commit: ad632d88d92a31d11d96651c58f3ec0fe8544812
    https://github.com/scummvm/scummvm/commit/ad632d88d92a31d11d96651c58f3ec0fe8544812
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2012-09-22T15:13:31-07:00

Commit Message:
PEGASUS: Fix movie pause/resume

Changed paths:
    engines/pegasus/movie.cpp



diff --git a/engines/pegasus/movie.cpp b/engines/pegasus/movie.cpp
index 6187d87..927f98f 100644
--- a/engines/pegasus/movie.cpp
+++ b/engines/pegasus/movie.cpp
@@ -185,17 +185,22 @@ void Movie::stop() {
 }
 
 void Movie::resume() {
-	if (_video)
-		_video->pauseVideo(false);
+	if (_paused) {
+		if (_video)
+			_video->pauseVideo(false);
 
-	TimeBase::resume();
+		_paused = false;
+	}
 }
 
 void Movie::pause() {
-	if (_video)
-		_video->pauseVideo(true);
+	if (isRunning() && !_paused) {
+		if (_video)
+			_video->pauseVideo(true);
 
-	TimeBase::pause();
+		_paused = true;
+		_pauseStart = g_system->getMillis();
+	}
 }
 
 TimeValue Movie::getDuration(const TimeScale scale) const {