diff options
| author | Max <post@wickenrode.com> | 2015-10-20 01:10:34 +0200 |
|---|---|---|
| committer | Max <post@wickenrode.com> | 2015-10-20 01:10:34 +0200 |
| commit | 91abde0c94df8bd7f63bd4e5d062562b0827adbd (patch) | |
| tree | 93e56fa1f65a67fefaf424410180e72ba8c3be29 /Source | |
| parent | ba5b71d5bb64fdc40a4a9eaeb7867fdaea8a1673 (diff) | |
| download | sequelpro-91abde0c94df8bd7f63bd4e5d062562b0827adbd.tar.gz sequelpro-91abde0c94df8bd7f63bd4e5d062562b0827adbd.tar.bz2 sequelpro-91abde0c94df8bd7f63bd4e5d062562b0827adbd.zip | |
Fix one cause a popular crash involving alert dialogs (part of #2297)
backport of e12e3e86f26b47a51c10940bca1102326d47bf82
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/SPTableContent.m | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Source/SPTableContent.m b/Source/SPTableContent.m index 922534a8..967cbaf0 100644 --- a/Source/SPTableContent.m +++ b/Source/SPTableContent.m @@ -989,12 +989,13 @@ static NSString *SPTableFilterSetDefaultOperator = @"SPTableFilterSetDefaultOper #ifndef SP_CODA if(activeFilter == 0) { #endif + NSString *errorDetail; if(filterString) - SPBeginAlertSheet(NSLocalizedString(@"Error", @"error"), NSLocalizedString(@"OK", @"OK button"), nil, nil, [tableDocumentInstance parentWindow], self, nil, nil, - [NSString stringWithFormat:NSLocalizedString(@"The table data couldn't be loaded presumably due to used filter clause. \n\nMySQL said: %@", @"message of panel when loading of table failed and presumably due to used filter argument"), [mySQLConnection lastErrorMessage]]); + errorDetail = [NSString stringWithFormat:NSLocalizedString(@"The table data couldn't be loaded presumably due to used filter clause. \n\nMySQL said: %@", @"message of panel when loading of table failed and presumably due to used filter argument"), [mySQLConnection lastErrorMessage]]; else - SPBeginAlertSheet(NSLocalizedString(@"Error", @"error"), NSLocalizedString(@"OK", @"OK button"), nil, nil, [tableDocumentInstance parentWindow], self, nil, nil, - [NSString stringWithFormat:NSLocalizedString(@"The table data couldn't be loaded.\n\nMySQL said: %@", @"message of panel when loading of table failed"), [mySQLConnection lastErrorMessage]]); + errorDetail = [NSString stringWithFormat:NSLocalizedString(@"The table data couldn't be loaded.\n\nMySQL said: %@", @"message of panel when loading of table failed"), [mySQLConnection lastErrorMessage]]; + + SPOnewayAlertSheet(NSLocalizedString(@"Error", @"error"), nil, [tableDocumentInstance parentWindow], errorDetail); } #ifndef SP_CODA // Filter task came from filter table |