aboutsummaryrefslogtreecommitdiff
path: root/engines/director/lingo/lingo-funcs.cpp
diff options
context:
space:
mode:
authorEugene Sandulenko2016-07-11 00:41:14 +0200
committerEugene Sandulenko2016-08-03 23:40:36 +0200
commit4d2e4a8c7345ae996b9ed6c8c3fbc3bc5f063ac8 (patch)
treeac1c121207157cab02cd8a3c5120572d7d3db678 /engines/director/lingo/lingo-funcs.cpp
parentffdb3f9d0f8f05b1735f7b447485d2d126c05c09 (diff)
downloadscummvm-rg350-4d2e4a8c7345ae996b9ed6c8c3fbc3bc5f063ac8.tar.gz
scummvm-rg350-4d2e4a8c7345ae996b9ed6c8c3fbc3bc5f063ac8.tar.bz2
scummvm-rg350-4d2e4a8c7345ae996b9ed6c8c3fbc3bc5f063ac8.zip
DIRECTOR: Lingo: Nicer error recovery during execution
Diffstat (limited to 'engines/director/lingo/lingo-funcs.cpp')
-rw-r--r--engines/director/lingo/lingo-funcs.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/director/lingo/lingo-funcs.cpp b/engines/director/lingo/lingo-funcs.cpp
index fbb65ea1a0..50120cf036 100644
--- a/engines/director/lingo/lingo-funcs.cpp
+++ b/engines/director/lingo/lingo-funcs.cpp
@@ -190,7 +190,7 @@ void Lingo::func_mciwait(Common::String &s) {
}
void Lingo::func_goto(Common::String &frame, Common::String &movie) {
- if (!_vm->_movies->contains(movie))
+ if (!_vm->_movies || !_vm->_movies->contains(movie))
error("Movie %s does not exist", movie.c_str());
_vm->_currentScore = _vm->_movies->getVal(movie);