diff options
Diffstat (limited to 'Source/SPCustomQuery.m')
| -rw-r--r-- | Source/SPCustomQuery.m | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/Source/SPCustomQuery.m b/Source/SPCustomQuery.m index 591bcb12..38c593d1 100644 --- a/Source/SPCustomQuery.m +++ b/Source/SPCustomQuery.m @@ -993,11 +993,7 @@ // Set up the table updates timer and wait for it to notify this thread about completion [[self onMainThread] initQueryLoadTimer]; - [resultLoadingCondition lock]; - while (![resultData dataDownloaded]) { - [resultLoadingCondition waitUntilDate:[NSDate dateWithTimeIntervalSinceNow:0.05]]; - } - [resultLoadingCondition unlock]; + [resultData awaitDataDownloaded]; // If the final column autoresize wasn't performed, perform it if (queryLoadLastRowCount < 200) [[self onMainThread] autosizeColumns]; @@ -1500,10 +1496,7 @@ } if ([resultData dataDownloaded]) { - [resultLoadingCondition lock]; - [resultLoadingCondition signal]; [self clearQueryLoadTimer]; - [resultLoadingCondition unlock]; } // Check whether a table update is required, based on whether new rows are @@ -3787,7 +3780,6 @@ runPrimaryActionButtonAsSelection = nil; queryLoadTimer = nil; - resultLoadingCondition = [NSCondition new]; prefs = [NSUserDefaults standardUserDefaults]; @@ -4070,7 +4062,6 @@ [NSObject cancelPreviousPerformRequestsWithTarget:customQueryView]; [self clearQueryLoadTimer]; - SPClear(resultLoadingCondition); SPClear(usedQuery); SPClear(lastExecutedQuery); SPClear(resultData); |