Bug 17: Don't allow joystick input while the menu or the virtual

keyboard is active
This commit is contained in:
simon.kagstrom 2010-03-13 07:04:37 +00:00
parent 0d0fc5002c
commit 30775231b9

View File

@ -934,6 +934,10 @@ uint8 C64::poll_joystick(int port)
if (!has_event) if (!has_event)
Gui::gui->pushJoystickEvent(EVENT_NONE); Gui::gui->pushJoystickEvent(EVENT_NONE);
/* No joystick input when the Gui is active */
if (Gui::gui->is_active || Gui::gui->kbd)
return 0xff;
/* Handle keyboard codes */ /* Handle keyboard codes */
for (int i = 0; i < 0x51; i++) for (int i = 0; i < 0x51; i++)
{ {