diff options
author | agent-q | 2011-05-21 16:01:26 +0100 |
---|---|---|
committer | agent-q | 2011-05-21 16:01:26 +0100 |
commit | 92d0216db18c96c97bb4b57ada76cf532838cf5b (patch) | |
tree | 6d405ce821d055403a10aa347e8ae2826917bba1 /engines/sci/console.cpp | |
parent | 4076a0466d67d42f093e3e73a30ea48e1e1d59e9 (diff) | |
parent | dd6b5698b181532b37cba41b1475b01813aadddc (diff) | |
download | scummvm-rg350-92d0216db18c96c97bb4b57ada76cf532838cf5b.tar.gz scummvm-rg350-92d0216db18c96c97bb4b57ada76cf532838cf5b.tar.bz2 scummvm-rg350-92d0216db18c96c97bb4b57ada76cf532838cf5b.zip |
Merge branch 'branch-1-3-0' of https://github.com/scummvm/scummvm into branch-1-3-0
Diffstat (limited to 'engines/sci/console.cpp')
-rw-r--r-- | engines/sci/console.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/sci/console.cpp b/engines/sci/console.cpp index 60bd129efc..7f0b641d83 100644 --- a/engines/sci/console.cpp +++ b/engines/sci/console.cpp @@ -3775,7 +3775,7 @@ int Console::printObject(reg_t pos) { DebugPrintf(" -- member variables:\n"); for (i = 0; (uint)i < obj->getVarCount(); i++) { DebugPrintf(" "); - if (i < var_container->getVarCount()) { + if (var_container && i < var_container->getVarCount()) { uint16 varSelector = var_container->getVarSelector(i); DebugPrintf("[%03x] %s = ", varSelector, _engine->getKernel()->getSelectorName(varSelector).c_str()); } else |