Merge branch 'mac-release'
This commit is contained in:
commit
2ec55e6587
@ -52,10 +52,14 @@ class FetchRequestOperation {
|
||||
var fetchersReturned = 0
|
||||
var fetchedArticles = Set<Article>()
|
||||
for articleFetcher in articleFetchers {
|
||||
var didCallCompletion = false
|
||||
articleFetcher.fetchArticlesAsync { (articles) in
|
||||
precondition(Thread.isMainThread)
|
||||
if self.isCanceled {
|
||||
completion(self)
|
||||
if !didCallCompletion {
|
||||
didCallCompletion = true
|
||||
completion(self)
|
||||
}
|
||||
return
|
||||
}
|
||||
fetchedArticles.formUnion(articles)
|
||||
|
Loading…
x
Reference in New Issue
Block a user