From 1f67c9dbbed5e92d8b9cb8f4d729366463a05937 Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Thu, 26 Jul 2012 23:44:40 -0400
Subject: VIDEO: Reset pause time when seeking/rewinding

---
 video/video_decoder.cpp | 2 ++
 video/video_decoder.h   | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/video/video_decoder.cpp b/video/video_decoder.cpp
index 9d6d40f7fb..77eab3a6e1 100644
--- a/video/video_decoder.cpp
+++ b/video/video_decoder.cpp
@@ -280,6 +280,7 @@ bool AdvancedVideoDecoder::rewind() {
 
 	_audioStartOffset = 0;
 	_startTime = g_system->getMillis();
+	resetPauseStartTime();
 	return true;
 }
 
@@ -314,6 +315,7 @@ bool AdvancedVideoDecoder::seek(const Audio::Timestamp &time) {
 
 	_audioStartOffset = time;
 	_startTime = g_system->getMillis() - time.msecs();
+	resetPauseStartTime();
 	_needsUpdate = true;
 	return true;
 }
diff --git a/video/video_decoder.h b/video/video_decoder.h
index ffeecd326d..f0427668a6 100644
--- a/video/video_decoder.h
+++ b/video/video_decoder.h
@@ -249,7 +249,6 @@ protected:
 
 	/**
 	 * Reset the pause start time (which should be called when seeking)
-	 * @note This function is now deprecated. There is no replacement.
 	 */
 	void resetPauseStartTime();
 
-- 
cgit v1.2.3