Merge pull request #1584 from quicksilver/i1583

keep AppKit calls on the main thread
quicksilver · Sep 4, 2013 · 3fbc7cb · 3fbc7cb
2 parents 1575ce7 + c8f7624
commit 3fbc7cb
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/Quicksilver/Code-QuickStepInterface/QSInterfaceController.m b/Quicksilver/Code-QuickStepInterface/QSInterfaceController.m
@@ -158,11 +158,13 @@ - (QSBasicObject *)selection {
 }
 
 - (void)showMainWindow:(id)sender {
-	[[self window] makeKeyAndOrderFront:sender];
-	if ([[NSUserDefaults standardUserDefaults] boolForKey:kSuppressHotKeysInCommand]) {
-		CGSConnection conn = _CGSDefaultConnection();
-		CGSSetGlobalHotKeyOperatingMode(conn, CGSGlobalHotKeyDisable);
-	}
+    runOnMainQueueSync(^{
+        [[self window] makeKeyAndOrderFront:sender];
+    });
+    if ([[NSUserDefaults standardUserDefaults] boolForKey:kSuppressHotKeysInCommand]) {
+        CGSConnection conn = _CGSDefaultConnection();
+        CGSSetGlobalHotKeyOperatingMode(conn, CGSGlobalHotKeyDisable);
+    }
 
     if ([[NSUserDefaults standardUserDefaults] boolForKey:@"QSSwitchKeyboardOnActivation"]) {
         savedKeyboard = TISCopyCurrentKeyboardLayoutInputSource();