FreshRSS
/
NetNewsWire
mirror of https://github.com/Ranchero-Software/NetNewsWire.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'mac-release'

This commit is contained in:
Brent Simmons 2019-09-03 22:59:29 -07:00
parent 0bfafc2da3 0ba8f3b4e1
commit 2ec55e6587
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Mac/MainWindow/Timeline/FetchRequestOperation.swift
View File

@ -52,10 +52,14 @@ class FetchRequestOperation {
var fetchersReturned = 0 var fetchersReturned = 0
var fetchedArticles = Set<Article>() var fetchedArticles = Set<Article>()
for articleFetcher in articleFetchers { for articleFetcher in articleFetchers {
var didCallCompletion = false
articleFetcher.fetchArticlesAsync { (articles) in articleFetcher.fetchArticlesAsync { (articles) in
precondition(Thread.isMainThread) precondition(Thread.isMainThread)
if self.isCanceled { if self.isCanceled {
completion(self) if !didCallCompletion {
didCallCompletion = true
completion(self)
}
return return
} }
fetchedArticles.formUnion(articles) fetchedArticles.formUnion(articles)