From 9a1f06bd2328561b0ca0a59840470b3f50ec8a47 Mon Sep 17 00:00:00 2001 From: rowanbeentje Date: Wed, 3 Apr 2013 01:00:57 +0000 Subject: - Move the SPBeginWaitingAlertSheet function to a beginWaitingAlertSheetWithTitle:... class method on a new SPAlertSheets class, allowing us to use invocation forwarding to ensure the entire function is executing on the main thread. This allows runloop processing to happen on the main thread, addressing Issue #1676 --- Source/SPCustomQuery.m | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) (limited to 'Source/SPCustomQuery.m') diff --git a/Source/SPCustomQuery.m b/Source/SPCustomQuery.m index 43bb425a..f89b095c 100644 --- a/Source/SPCustomQuery.m +++ b/Source/SPCustomQuery.m @@ -733,15 +733,19 @@ if (![mySQLConnection lastQueryWasCancelled]) { [tableDocumentInstance setTaskIndicatorShouldAnimate:NO]; - SPBeginWaitingAlertSheet(@"title", - NSLocalizedString(@"Run All", @"run all button"), NSLocalizedString(@"Continue", @"continue button"), NSLocalizedString(@"Stop", @"stop button"), - NSWarningAlertStyle, [tableDocumentInstance parentWindow], self, - @selector(sheetDidEnd:returnCode:contextInfo:), - @"runAllContinueStopSheet", - NSLocalizedString(@"MySQL Error", @"mysql error message"), - [mySQLConnection lastErrorMessage], - &runAllContinueStopSheetReturnCode - ); + [SPAlertSheets beginWaitingAlertSheetWithTitle:@"title" + defaultButton:NSLocalizedString(@"Run All", @"run all button") + alternateButton:NSLocalizedString(@"Continue", @"continue button") + otherButton:NSLocalizedString(@"Stop", @"stop button") + alertStyle:NSWarningAlertStyle + docWindow:[tableDocumentInstance parentWindow] + modalDelegate:self + didEndSelector:@selector(sheetDidEnd:returnCode:contextInfo:) + contextInfo:@"runAllContinueStopSheet" + msg:NSLocalizedString(@"MySQL Error", @"mysql error message") + infoText:[mySQLConnection lastErrorMessage] + returnCode:&runAllContinueStopSheetReturnCode]; + [tableDocumentInstance setTaskIndicatorShouldAnimate:YES]; switch (runAllContinueStopSheetReturnCode) { -- cgit v1.2.3