From 008b8291ebaf3042c7229350ca1c77a110f4b65d Mon Sep 17 00:00:00 2001
From: rowanbeentje <rowan@beent.je>
Date: Tue, 20 Mar 2012 22:33:13 +0000
Subject:  - When cancelling a sort on the table content view, don't display an
 error message

---
 Source/SPTableContent.m | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/SPTableContent.m b/Source/SPTableContent.m
index e0af1d54..9ba7446a 100644
--- a/Source/SPTableContent.m
+++ b/Source/SPTableContent.m
@@ -4220,7 +4220,7 @@
 	previousTableRowsCount = tableRowsCount;
 	[self loadTableValues];
 
-	if ([mySQLConnection queryErrored]) {
+	if ([mySQLConnection queryErrored] && ![mySQLConnection lastQueryWasCancelled]) {
 		SPBeginAlertSheet(NSLocalizedString(@"Error", @"error"), NSLocalizedString(@"OK", @"OK button"), nil, nil, [tableDocumentInstance parentWindow], self, nil, nil,
 						  [NSString stringWithFormat:NSLocalizedString(@"Couldn't sort table. MySQL said: %@", @"message of panel when sorting of table failed"), [mySQLConnection lastErrorMessage]]);
 		[tableDocumentInstance endTask];
-- 
cgit v1.2.3