[Scummvm-cvs-logs] scummvm master -> 60943efafd15b0e9bb8bbf533714cac7779b5dba

[bluegr]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
60943efafd SCI: Fixed bug #3295931 - "SCI: JONES: Disabled commands are available using shortcuts"


Commit: 60943efafd15b0e9bb8bbf533714cac7779b5dba
    https://github.com/scummvm/scummvm/commit/60943efafd15b0e9bb8bbf533714cac7779b5dba
Author: md5 (md5 at scummvm.org)
Date: 2011-06-12T07:58:25-07:00

Commit Message:
SCI: Fixed bug #3295931 - "SCI: JONES: Disabled commands are available using shortcuts"

Changed paths:
    engines/sci/graphics/menu.cpp



diff --git a/engines/sci/graphics/menu.cpp b/engines/sci/graphics/menu.cpp
index 9d4ab3f..913f680 100644
--- a/engines/sci/graphics/menu.cpp
+++ b/engines/sci/graphics/menu.cpp
@@ -423,7 +423,9 @@ reg_t GfxMenu::kernelSelect(reg_t eventObject, bool pauseSound) {
 		default:
 			while (itemIterator != itemEnd) {
 				itemEntry = *itemIterator;
-				if ((itemEntry->keyPress == keyPress) && (itemEntry->keyModifier == keyModifier))
+				if (itemEntry->keyPress == keyPress && 
+					itemEntry->keyModifier == keyModifier && 
+					itemEntry->enabled)
 					break;
 				itemIterator++;
 			}