From 2f6d47059ba8c63d0f8e2f52e5498cab8b9f07bc Mon Sep 17 00:00:00 2001
From: athrxx
Date: Wed, 17 Apr 2013 22:15:18 +0200
Subject: KYRA: (EOB) - fix possible null ptr dereference in gui_eob.cpp

---
 engines/kyra/gui_eob.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'engines/kyra')

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);
 
-- 
cgit v1.2.3