Fix a case of "background thread updating UI"

sequelpro · Jun 26, 2016 · bfc53dc39c04f4c2eb3d0d79a938cf5dea368da5 · bfc53dc
1 parent bede490
commit bfc53dc39c04f4c2eb3d0d79a938cf5dea368da5
Unified Split

Showing with 18 additions and 16 deletions.

+18 −16 Source/SPDatabaseDocument.m
diff --git a/Source/SPDatabaseDocument.m b/Source/SPDatabaseDocument.m
@@ -6303,22 +6303,24 @@ - (void)_selectDatabaseAndItem:(NSDictionary *)selectionDetails

 #ifndef SP_CODA /* update selected table in SPTablesList */

-	BOOL focusOnFilter = YES;
-	if (targetItemName) focusOnFilter = NO;
-
-	// If a the table has changed, update the selection
-	if (![targetItemName isEqualToString:[self table]] && targetItemName) {
-		focusOnFilter = ![tablesListInstance selectItemWithName:targetItemName];
-	}
-
-	// Ensure the window focus is on the table list or the filter as appropriate
-	[[tablesListInstance onMainThread] setTableListSelectability:YES];
-	if (focusOnFilter) {
-		[[tablesListInstance onMainThread] makeTableListFilterHaveFocus];
-	} else {
-		[[tablesListInstance onMainThread] makeTableListHaveFocus];
-	}
-	[[tablesListInstance onMainThread] setTableListSelectability:NO];
+	SPMainQSync(^{
+		BOOL focusOnFilter = YES;
+		if (targetItemName) focusOnFilter = NO;
+		
+		// If a the table has changed, update the selection
+		if (![targetItemName isEqualToString:[self table]] && targetItemName) {
+			focusOnFilter = ![tablesListInstance selectItemWithName:targetItemName];
+		}
+		
+		// Ensure the window focus is on the table list or the filter as appropriate
+		[tablesListInstance setTableListSelectability:YES];
+		if (focusOnFilter) {
+			[tablesListInstance makeTableListFilterHaveFocus];
+		} else {
+			[tablesListInstance makeTableListHaveFocus];
+		}
+		[tablesListInstance setTableListSelectability:NO];
+	});

 #endif
 	[self endTask];