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

[dreammaster]

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:
d4774d1cb2 SHERLOCK: RT: Fix crash skipping intro when anim is active


Commit: d4774d1cb21507c66a438746619c69a11ce321d0
    https://github.com/scummvm/scummvm/commit/d4774d1cb21507c66a438746619c69a11ce321d0
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-10-16T19:36:23-04:00

Commit Message:
SHERLOCK: RT: Fix crash skipping intro when anim is active

Changed paths:
    engines/sherlock/image_file.cpp
    engines/sherlock/tattoo/tattoo_scene.cpp



diff --git a/engines/sherlock/image_file.cpp b/engines/sherlock/image_file.cpp
index a1636e9..971980a 100644
--- a/engines/sherlock/image_file.cpp
+++ b/engines/sherlock/image_file.cpp
@@ -1054,6 +1054,7 @@ void StreamingImageFile::close() {
 
 bool StreamingImageFile::getNextFrame() {
 	// Don't proceed if we're already at the end of the stream
+	assert(_stream);
 	if (_stream->pos() >= _stream->size()) {
 		_active = false;
 		return false;
diff --git a/engines/sherlock/tattoo/tattoo_scene.cpp b/engines/sherlock/tattoo/tattoo_scene.cpp
index aec80ba..96c7764 100644
--- a/engines/sherlock/tattoo/tattoo_scene.cpp
+++ b/engines/sherlock/tattoo/tattoo_scene.cpp
@@ -690,6 +690,7 @@ int TattooScene::startCAnim(int cAnimNum, int playRate) {
 				_goToScene = STARTING_GAME_SCENE;
 				talk._talkToAbort = true;
 				_activeCAnim.close();
+				break;
 			}
 		}
 	}