[Scummvm-git-logs] scummvm master -> abf17aaa5920572c4bcbeb54577840122e9593fc

[sev-]

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:
abf17aaa59 VIDEO: fix rewinding of FLIC files


Commit: abf17aaa5920572c4bcbeb54577840122e9593fc
    https://github.com/scummvm/scummvm/commit/abf17aaa5920572c4bcbeb54577840122e9593fc
Author: whiterandrek (whiterandrek at gmail.com)
Date: 2018-06-15T00:25:57+02:00

Commit Message:
VIDEO: fix rewinding of FLIC files

Changed paths:
    video/flic_decoder.cpp


diff --git a/video/flic_decoder.cpp b/video/flic_decoder.cpp
index 57d8fb5..9e79786 100644
--- a/video/flic_decoder.cpp
+++ b/video/flic_decoder.cpp
@@ -130,14 +130,13 @@ bool FlicDecoder::FlicVideoTrack::endOfTrack() const {
 }
 
 bool FlicDecoder::FlicVideoTrack::rewind() {
-	_curFrame = -1;
-	_nextFrameStartTime = 0;
-
-	if (endOfTrack() && _fileStream->pos() < _fileStream->size())
+	if (endOfTrack() && _fileStream->pos() < _fileStream->size() && _frameCount != 1)
 		_atRingFrame = true;
 	else
 		_fileStream->seek(_offsetFrame1);
 
+	_curFrame = -1;
+	_nextFrameStartTime = 0;
 	_frameDelay = _startFrameDelay;
 	return true;
 }