diff options
| author | James Brown | 2002-09-17 12:52:53 +0000 |
|---|---|---|
| committer | James Brown | 2002-09-17 12:52:53 +0000 |
| commit | 978e879009e205f32b4579f8a77061a9619bc2ea (patch) | |
| tree | dbb7357ea7d03a6da438ad1504b2bc55c2fec5a2 /gui | |
| parent | ab2eb4d928ff2dae94cce3bcb228c504964a9bf7 (diff) | |
| download | scummvm-rg350-978e879009e205f32b4579f8a77061a9619bc2ea.tar.gz scummvm-rg350-978e879009e205f32b4579f8a77061a9619bc2ea.tar.bz2 scummvm-rg350-978e879009e205f32b4579f8a77061a9619bc2ea.zip | |
Fix newgui crash, and commit patch 600645: Loom flashlight fix
svn-id: r4958
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/dialog.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gui/dialog.cpp b/gui/dialog.cpp index b2c5473383..54b50e8958 100644 --- a/gui/dialog.cpp +++ b/gui/dialog.cpp @@ -151,7 +151,7 @@ void Dialog::handleMouseDown(int x, int y, int button, int clickCount) _focusedWidget = w; } - if (w == _focusedWidget) + if (w && w == _focusedWidget) _focusedWidget->handleMouseDown(x - _focusedWidget->_x, y - _focusedWidget->_y, button, clickCount); } @@ -428,8 +428,8 @@ AboutDialog::AboutDialog(NewGui *gui) : Dialog (gui, 30, 20, 260, 124) { addButton(110, 100, 40, 16, CUSTOM_STRING(23), kCloseCmd, 'C'); // Close dialog - FIXME - new StaticTextWidget(this, 10, 10, 240, 16, "Build " SCUMMVM_VERSION " (" SCUMMVM_CVS ")", kTextAlignCenter); - new StaticTextWidget(this, 10, 30, 240, 16, "ScummVM http://scummvm.sourceforge.net", kTextAlignCenter); + new StaticTextWidget(this, 10, 10, 240, 16, "ScummVM " SCUMMVM_VERSION " (" SCUMMVM_CVS ")", kTextAlignCenter); + new StaticTextWidget(this, 10, 30, 240, 16, "http://scummvm.sourceforge.net", kTextAlignCenter); new StaticTextWidget(this, 10, 50, 240, 16, "All games (c) LucasArts", kTextAlignCenter); new StaticTextWidget(this, 10, 64, 240, 16, "Except", kTextAlignCenter); new StaticTextWidget(this, 10, 78, 240, 16, "Simon the Sorcerer (c) Adventuresoft", kTextAlignCenter); |