Changeset 35821 in vbox

Timestamp:

Feb 2, 2011 12:55:40 PM (14 years ago)

Author:

vboxsync

Message:

FE/Qt4-OSX: move the check back to the correct place

File:

• trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIHotKeyEditor.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIHotKeyEditor.cpp

@@ -182 +182 @@
 
 #ifdef Q_WS_MAC
-    if (!iKeyCode || iKeyCode == ~0U)
-        return false;
-
     UInt32 modMask = ::DarwinKeyCodeToDarwinModifierMask(iKeyCode);
     switch (modMask)
@@ -478 +475 @@
 
             /* Convert to keycode: */
-            unsigned iKeyCode = ::DarwinModifierMaskToDarwinKeycode(changed);
+            unsigned uKeyCode = ::DarwinModifierMaskToDarwinKeycode(changed);
+
+            if (!uKeyCode || uKeyCode == ~0U)
+                return false;
 
             /* Process the key event: */
-            if (processKeyEvent(iKeyCode, changed & modifierMask))
+            if (processKeyEvent(uKeyCode, changed & modifierMask))
             {
                 /* Save the new modifier mask state. */