[Scummvm-git-logs] scummvm master -> 07b4495e2b184496be4c24c9cfe041b4717df03e

[whiterandrek]

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:
07b4495e2b PINK: fixed ActionPlay behavior when startFrame is wrong


Commit: 07b4495e2b184496be4c24c9cfe041b4717df03e
    https://github.com/scummvm/scummvm/commit/07b4495e2b184496be4c24c9cfe041b4717df03e
Author: Andrei Prykhodko (whiterandrek at gmail.com)
Date: 2019-01-15T23:11:00+02:00

Commit Message:
PINK: fixed ActionPlay behavior when startFrame is wrong

This fixes Trac bug #10800

Changed paths:
    engines/pink/objects/actions/action_play.cpp


diff --git a/engines/pink/objects/actions/action_play.cpp b/engines/pink/objects/actions/action_play.cpp
index 9551f13..b7b171d 100644
--- a/engines/pink/objects/actions/action_play.cpp
+++ b/engines/pink/objects/actions/action_play.cpp
@@ -65,8 +65,10 @@ void ActionPlay::onStart() {
 	if (_stopFrame == -1 || _stopFrame >= frameCount)
 		_stopFrame = frameCount - 1;
 
-	if (_startFrame >= _decoder.getFrameCount())
-		_startFrame = 0;
+	if (_startFrame >= _decoder.getFrameCount()) {
+		_actor->endAction();
+		return;
+	}
 
 	ActionCEL::setFrame(_startFrame);
 	// doesn't need to decode startFrame here. Update method will decode