diff options
| author | athrxx | 2013-04-17 22:15:18 +0200 |
|---|---|---|
| committer | athrxx | 2013-04-18 16:10:54 +0200 |
| commit | 2f6d47059ba8c63d0f8e2f52e5498cab8b9f07bc (patch) | |
| tree | 883fce86a81f2b555d653f61a2a677f24f4a1ee9 /engines | |
| parent | b04059cd23ffc235f2a4518a040de76d2d390926 (diff) | |
| download | scummvm-rg350-2f6d47059ba8c63d0f8e2f52e5498cab8b9f07bc.tar.gz scummvm-rg350-2f6d47059ba8c63d0f8e2f52e5498cab8b9f07bc.tar.bz2 scummvm-rg350-2f6d47059ba8c63d0f8e2f52e5498cab8b9f07bc.zip | |
KYRA: (EOB) - fix possible null ptr dereference in gui_eob.cpp
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/kyra/gui_eob.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/engines/kyra/gui_eob.cpp b/engines/kyra/gui_eob.cpp index ed3aaefbd9..a2133802bd 100644 --- a/engines/kyra/gui_eob.cpp +++ b/engines/kyra/gui_eob.cpp @@ -2056,9 +2056,8 @@ void GUI_EoB::runCampMenu() { if (inputFlag == _vm->_keyMap[Common::KEYCODE_ESCAPE]) inputFlag = 0x8007; - else if (inputFlag == _vm->_keyMap[Common::KEYCODE_KP5] || inputFlag == _vm->_keyMap[Common::KEYCODE_SPACE] || inputFlag == _vm->_keyMap[Common::KEYCODE_RETURN]) { + else if (prevHighlightButton && (inputFlag == _vm->_keyMap[Common::KEYCODE_KP5] || inputFlag == _vm->_keyMap[Common::KEYCODE_SPACE] || inputFlag == _vm->_keyMap[Common::KEYCODE_RETURN])) inputFlag = 0x8000 + prevHighlightButton->index; - } Button *clickedButton = _vm->gui_getButton(buttonList, inputFlag & 0x7FFF); |