aboutsummaryrefslogtreecommitdiffstats
path: root/Source/SPTableContent.m
diff options
context:
space:
mode:
authorMax <post@wickenrode.com>2015-04-22 22:30:57 +0200
committerMax <post@wickenrode.com>2015-04-22 22:30:57 +0200
commit75738e17389d9d66713fdde60cfd59774c934557 (patch)
tree77a7e78bd46ffc737d92939d20359761e26c5ea4 /Source/SPTableContent.m
parent55951d00cde44cfc654a2a6cb97e941eca2eb70f (diff)
downloadsequelpro-75738e17389d9d66713fdde60cfd59774c934557.tar.gz
sequelpro-75738e17389d9d66713fdde60cfd59774c934557.tar.bz2
sequelpro-75738e17389d9d66713fdde60cfd59774c934557.zip
Fixed two case of background thread interacting with UI
aka "deleted uncommited CA transaction"
Diffstat (limited to 'Source/SPTableContent.m')
-rw-r--r--Source/SPTableContent.m6
1 files changed, 5 insertions, 1 deletions
diff --git a/Source/SPTableContent.m b/Source/SPTableContent.m
index 45add266..7b60d152 100644
--- a/Source/SPTableContent.m
+++ b/Source/SPTableContent.m
@@ -811,7 +811,7 @@ static NSString *SPTableFilterSetDefaultOperator = @"SPTableFilterSetDefaultOper
[self fieldListForQuery], [selectedTable backtickQuotedString]];
// Add a filter string if appropriate
- filterString = [self tableFilterString];
+ filterString = [[self onMainThread] tableFilterString];
if (filterString) {
[queryString appendFormat:@" WHERE %@", filterString];
@@ -1071,6 +1071,8 @@ static NSString *SPTableFilterSetDefaultOperator = @"SPTableFilterSetDefaultOper
* Returns the query string for the current filter settings,
* ready to be dropped into a WHERE clause, or nil if no filtering
* is active.
+ *
+ * @warning Uses UI. ONLY call from main thread!
*/
- (NSString *)tableFilterString
{
@@ -3912,6 +3914,8 @@ static NSString *SPTableFilterSetDefaultOperator = @"SPTableFilterSetDefaultOper
/**
* Provide a getter for the current filter details
+ *
+ * @warning Uses UI. MUST call from main thread!
*/
- (NSDictionary *) filterSettings
{