#3213: Fix crash caused by c37bea8.

sequelpro · Oct 10, 2018 · 102f6ef · 102f6ef · dmoagx · Oct 11, 2018
1 parent 582885a
commit 102f6ef
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/Source/SPAlertSheets.m b/Source/SPAlertSheets.m
@@ -30,6 +30,7 @@
 
 #import "SPAlertSheets.h"
 #import "SPMainThreadTrampoline.h"
+#import "SPFunctions.h"
 
 @implementation SPAlertSheets
 
@@ -207,7 +208,7 @@ void SPBeginAlertSheet(
 		void *contextInfo,
 	NSString *msg) 
 {
-	dispatch_sync(dispatch_get_main_queue(), ^{
+	void (^alertBlock)(void) = ^{
 		// Set up an NSAlert with the supplied details
 		NSAlert *alert = [[[NSAlert alloc] init] autorelease];
 
@@ -236,5 +237,12 @@ void SPBeginAlertSheet(
 
 		// Ensure the alerting window is frontmost
 		[docWindow makeKeyWindow];
-	});
+	};
+
+	if (dispatch_get_current_queue() == dispatch_get_main_queue()) {
+		alertBlock();
+	}
+	else {
+		dispatch_sync(dispatch_get_main_queue(), alertBlock);
+	}
 }