aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Kiewitz2009-10-23 20:41:59 +0000
committerMartin Kiewitz2009-10-23 20:41:59 +0000
commit701caea8d7b5f462df106a093051f534b3f1699b (patch)
treee2ace264766cbbc6f071360deb0060ad4948cae0
parentf0c429028705e5a7d9a434dd3357b18b416c0f96 (diff)
downloadscummvm-rg350-701caea8d7b5f462df106a093051f534b3f1699b.tar.gz
scummvm-rg350-701caea8d7b5f462df106a093051f534b3f1699b.tar.bz2
scummvm-rg350-701caea8d7b5f462df106a093051f534b3f1699b.zip
SCI: kAddToPic - abort when list is null reference (fixes qfg1 saved game loading on some screens)
svn-id: r45351
-rw-r--r--engines/sci/engine/kgraphics.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/engines/sci/engine/kgraphics.cpp b/engines/sci/engine/kgraphics.cpp
index fe2ac41058..64a042c2c4 100644
--- a/engines/sci/engine/kgraphics.cpp
+++ b/engines/sci/engine/kgraphics.cpp
@@ -841,6 +841,8 @@ reg_t kAddToPic(EngineState *s, int argc, reg_t *argv) {
case 0:
break;
case 1:
+ if (argv[0].isNull())
+ return s->r_acc;
s->_gui->addToPicList(argv[0], argc, argv);
break;
case 7: