aboutsummaryrefslogtreecommitdiff
path: root/engines/mads/nebular/dialogs_nebular.cpp
diff options
context:
space:
mode:
authorStrangerke2016-01-11 07:02:49 +0100
committerStrangerke2016-01-11 07:02:49 +0100
commit60443e49e8f550c9287ec7752aac3efc87ae1da2 (patch)
tree0fb98ba545cc9ec354ca0dc7a21cdd3c49969f1a /engines/mads/nebular/dialogs_nebular.cpp
parent07f82d0b38940ba284bc10b0ab8ddeceb6ac1a13 (diff)
downloadscummvm-rg350-60443e49e8f550c9287ec7752aac3efc87ae1da2.tar.gz
scummvm-rg350-60443e49e8f550c9287ec7752aac3efc87ae1da2.tar.bz2
scummvm-rg350-60443e49e8f550c9287ec7752aac3efc87ae1da2.zip
MADS: Check 'dialog' earlier to avoid untested null dereference
Diffstat (limited to 'engines/mads/nebular/dialogs_nebular.cpp')
-rw-r--r--engines/mads/nebular/dialogs_nebular.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/mads/nebular/dialogs_nebular.cpp b/engines/mads/nebular/dialogs_nebular.cpp
index ede16e1f99..58e60fe323 100644
--- a/engines/mads/nebular/dialogs_nebular.cpp
+++ b/engines/mads/nebular/dialogs_nebular.cpp
@@ -171,12 +171,12 @@ bool DialogsNebular::show(int messageId, int objectId) {
crFlag = false;
}
- if (!centerFlag)
- dialog->incNumLines();
-
if (!dialog)
error("DialogsNebular::show - Uninitialized dialog");
+ if (!centerFlag)
+ dialog->incNumLines();
+
// Show the dialog
_vm->_events->setCursor(CURSOR_ARROW);
dialog->show();