diff options
| author | Paul Gilbert | 2015-10-16 19:36:23 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2015-10-16 19:36:23 -0400 |
| commit | d4774d1cb21507c66a438746619c69a11ce321d0 (patch) | |
| tree | 44fcadfe6935e15b401889e28fb411bf514d5d0b /engines/sherlock | |
| parent | 7f9a2c5c82dc68ff8f6973ec7463fac2034c40bd (diff) | |
| download | scummvm-rg350-d4774d1cb21507c66a438746619c69a11ce321d0.tar.gz scummvm-rg350-d4774d1cb21507c66a438746619c69a11ce321d0.tar.bz2 scummvm-rg350-d4774d1cb21507c66a438746619c69a11ce321d0.zip | |
SHERLOCK: RT: Fix crash skipping intro when anim is active
Diffstat (limited to 'engines/sherlock')
| -rw-r--r-- | engines/sherlock/image_file.cpp | 1 | ||||
| -rw-r--r-- | engines/sherlock/tattoo/tattoo_scene.cpp | 1 |
2 files changed, 2 insertions, 0 deletions
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; } } } |