Changeset 2377 in vbox

Timestamp:

Apr 27, 2007 2:49:06 AM (18 years ago)

Author:

vboxsync

Message:

Don't assert when the screensaver takes over.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/darwin/DarwinKeyboard.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/darwin/DarwinKeyboard.cpp

@@ -239 +239 @@
 
 
-/** Keeping track of whether we disabled the hotkeys or not. */
-static bool g_fHotKeysDisabled = false;
 /** Whether we've connected or not. */
 static bool g_fConnectedToCGS = false;
@@ -449 +447 @@
     else
     {
-        if (    enmMode != kCGSGlobalHotKeyDisable
-            /*||  !g_fHotKeysDisabled*/)
+        if (enmMode != kCGSGlobalHotKeyDisable)
             return;
         enmMode = kCGSGlobalHotKeyEnable;
@@ -461 +458 @@
     CGSGlobalHotKeyOperatingMode enmNewMode = kCGSGlobalHotKeyInvalid;
     CGSGetGlobalHotKeyOperatingMode(g_CGSConnection, &enmNewMode);
-    if (enmNewMode == enmMode)
-        g_fHotKeysDisabled = enmMode == kCGSGlobalHotKeyDisable;
-    else 
-    {
-        AssertMsgFailed(("enmNewMode=%d enmMode=%d\n", enmNewMode, enmMode));
+    if (enmNewMode != enmMode)
+    {
+        /* If the screensaver kicks in we should ignore failure here. */
+        AssertMsg(enmMode == kCGSGlobalHotKeyEnable, ("enmNewMode=%d enmMode=%d\n", enmNewMode, enmMode));
         if (s_cComplaints++ < 32)
             LogRel(("DarwinDisableGlobalHotKeys: Failed to change mode; enmNewMode=%d enmMode=%d\n", enmNewMode, enmMode));