Merge pull request #3067 from quicksilver/fix_main_queue_crash

pjrobertson · web-flow · commit 2d8ade08d07a · 2025-09-13T09:07:42.000+02:00
Use isMainThread to check if we're on the main thread
diff --git a/Quicksilver/Code-QuickStepFoundation/QSGCD.h b/Quicksilver/Code-QuickStepFoundation/QSGCD.h
@@ -33,7 +33,11 @@ inline void QSGCDQueueDelayed(dispatch_queue_t queue, NSTimeInterval delay, void
 
 inline void QSGCDMainSync(void (^block)(void))
 {
-    QSGCDQueueSync(dispatch_get_main_queue(), block);
+    if ([NSThread isMainThread]) {
+        block();
+    } else {
+        dispatch_sync(dispatch_get_main_queue(), block);
+    }
 }
 
 inline void QSGCDMainAsync(void (^block)(void))

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,11 @@ inline void QSGCDQueueDelayed(dispatch_queue_t queue, NSTimeInterval delay, void`
`33`	`33`
`34`	`34`	`inline void QSGCDMainSync(void (^block)(void))`
`35`	`35`	`{`
`36`		`- QSGCDQueueSync(dispatch_get_main_queue(), block);`
	`36`	`+ if ([NSThread isMainThread]) {`
	`37`	`+ block();`
	`38`	`+ } else {`
	`39`	`+ dispatch_sync(dispatch_get_main_queue(), block);`
	`40`	`+ }`
`37`	`41`	`}`
`38`	`42`
`39`	`43`	`inline void QSGCDMainAsync(void (^block)(void))`