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

Update isExecuting and isFinished in a way that should make NSOperationQueue happy. Hopefully this fixes a mystery crash bug.

This commit is contained in:
Brent Simmons 2019-12-31 15:40:05 -08:00
parent 8a85b18d09
commit 51faf77e59
1 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
Frameworks/Account/Feedly/Operations/FeedlyOperation.swift
View File

@ -35,8 +35,7 @@ class FeedlyOperation: Operation {
downloadProgress = nil downloadProgress = nil
isExecutingOperation = false updateExecutingAndFinished(false, true)
isFinishedOperation = true
} }
func didFinish(_ error: Error) { func didFinish(_ error: Error) {
@ -58,9 +57,8 @@ class FeedlyOperation: Operation {
override func start() { override func start() {
guard !isCancelled else { guard !isCancelled else {
isExecutingOperation = false updateExecutingAndFinished(false, true)
isFinishedOperation = true
if downloadProgress != nil { if downloadProgress != nil {
DispatchQueue.main.async { DispatchQueue.main.async {
self.downloadProgress = nil self.downloadProgress = nil
@ -69,8 +67,8 @@ class FeedlyOperation: Operation {
return return
} }
isExecutingOperation = true updateExecutingAndFinished(true, false)
DispatchQueue.main.async { DispatchQueue.main.async {
self.main() self.main()
} }
@ -80,24 +78,30 @@ class FeedlyOperation: Operation {
return isExecutingOperation return isExecutingOperation
} }
private var isExecutingOperation = false {
willSet {
willChangeValue(for: \.isExecuting)
}
didSet {
didChangeValue(for: \.isExecuting)
}
}
override var isFinished: Bool { override var isFinished: Bool {
return isFinishedOperation return isFinishedOperation
} }
private var isFinishedOperation = false { private var isExecutingOperation = false
willSet { private var isFinishedOperation = false
private func updateExecutingAndFinished(_ executing: Bool, _ finished: Bool) {
let isExecutingDidChange = executing != isExecutingOperation
let isFinishedDidChange = finished != isFinishedOperation
if isFinishedDidChange {
willChangeValue(for: \.isFinished) willChangeValue(for: \.isFinished)
} }
didSet { if isExecutingDidChange {
willChangeValue(for: \.isExecuting)
}
isExecutingOperation = executing
isFinishedOperation = finished
if isExecutingDidChange {
didChangeValue(for: \.isExecuting)
}
if isFinishedDidChange {
didChangeValue(for: \.isFinished) didChangeValue(for: \.isFinished)
} }
} }