From d4774d1cb21507c66a438746619c69a11ce321d0 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 16 Oct 2015 19:36:23 -0400
Subject: SHERLOCK: RT: Fix crash skipping intro when anim is active

---
 engines/sherlock/image_file.cpp          | 1 +
 engines/sherlock/tattoo/tattoo_scene.cpp | 1 +
 2 files changed, 2 insertions(+)

(limited to 'engines/sherlock')

diff --git a/engines/sherlock/image_file.cpp b/engines/sherlock/image_file.cpp
index a1636e9195..971980a2ac 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 aec80ba34f..96c7764a85 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;
 			}
 		}
 	}
-- 
cgit v1.2.3