Skip to content

Commit 6bc8cd3

Browse files
committed
#3213: Switch to using SPMainQSync.
1 parent 61c3aa1 commit 6bc8cd3

File tree

2 files changed

+5
-9
lines changed

2 files changed

+5
-9
lines changed

Source/SPAlertSheets.m

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030

3131
#import "SPAlertSheets.h"
3232
#import "SPMainThreadTrampoline.h"
33+
#import "SPFunctions.h"
3334

3435
@implementation SPAlertSheets
3536

@@ -207,7 +208,7 @@ void SPBeginAlertSheet(
207208
void *contextInfo,
208209
NSString *msg)
209210
{
210-
void (^alertBlock)(void) = ^{
211+
SPMainQSync(^{
211212
// Set up an NSAlert with the supplied details
212213
NSAlert *alert = [[[NSAlert alloc] init] autorelease];
213214

@@ -236,12 +237,5 @@ void SPBeginAlertSheet(
236237

237238
// Ensure the alerting window is frontmost
238239
[docWindow makeKeyWindow];
239-
};
240-
241-
if (dispatch_get_current_queue() == dispatch_get_main_queue()) {
242-
alertBlock();
243-
}
244-
else {
245-
dispatch_sync(dispatch_get_main_queue(), alertBlock);
246-
}
240+
});
247241
}

sequel-pro.xcodeproj/project.pbxproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@
9898
17D3C66E128AD4710047709F /* SPFavoritesController.m in Sources */ = {isa = PBXBuildFile; fileRef = 17D3C66D128AD4710047709F /* SPFavoritesController.m */; };
9999
17D3C671128AD8160047709F /* SPSingleton.m in Sources */ = {isa = PBXBuildFile; fileRef = 17D3C670128AD8160047709F /* SPSingleton.m */; };
100100
17D3C6D3128B1C900047709F /* SPFavoritesOutlineView.m in Sources */ = {isa = PBXBuildFile; fileRef = 17D3C6D2128B1C900047709F /* SPFavoritesOutlineView.m */; };
101+
17D41A8221700F8200B1888D /* SPFunctions.m in Sources */ = {isa = PBXBuildFile; fileRef = 507FF1111BBCC57600104523 /* SPFunctions.m */; };
101102
17D5B49E1553059F00EF3BB3 /* SPViewCopy.m in Sources */ = {isa = PBXBuildFile; fileRef = 17D5B49D1553059F00EF3BB3 /* SPViewCopy.m */; };
102103
17DB5F441555CA300046834B /* SPMutableArrayAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 1798F19715501838004B0AB8 /* SPMutableArrayAdditions.m */; };
103104
17DD52B7115071D0007D8950 /* SPPrintTemplate.html in Resources */ = {isa = PBXBuildFile; fileRef = 17DD52B6115071D0007D8950 /* SPPrintTemplate.html */; };
@@ -3157,6 +3158,7 @@
31573158
isa = PBXSourcesBuildPhase;
31583159
buildActionMask = 2147483647;
31593160
files = (
3161+
17D41A8221700F8200B1888D /* SPFunctions.m in Sources */,
31603162
507FF2421BC33BBC00104523 /* SPOSInfo.m in Sources */,
31613163
586F457B0FDB269E00B428D7 /* RegexKitLite.m in Sources */,
31623164
58CDB3410FCE141900F8ACA3 /* SequelProTunnelAssistant.m in Sources */,

0 commit comments

Comments
 (0)