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

Fix bug where deleting from the sidebar would not stick across runs of the app sometimes — whatever you deleted could come back.

This commit is contained in:
Brent Simmons 2018-02-24 15:54:32 -08:00
parent cfd862c30b
commit 7def2ae8d0
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Frameworks/Account/Account.swift
View File

@ -117,6 +117,7 @@ public final class Account: DisplayNameProvider, UnreadCountProvider, Container,
NotificationCenter.default.addObserver(self, selector: #selector(batchUpdateDidPerform(_:)), name: .BatchUpdateDidPerform, object: nil) NotificationCenter.default.addObserver(self, selector: #selector(batchUpdateDidPerform(_:)), name: .BatchUpdateDidPerform, object: nil)
NotificationCenter.default.addObserver(self, selector: #selector(feedSettingDidChange(_:)), name: .FeedSettingDidChange, object: nil) NotificationCenter.default.addObserver(self, selector: #selector(feedSettingDidChange(_:)), name: .FeedSettingDidChange, object: nil)
NotificationCenter.default.addObserver(self, selector: #selector(displayNameDidChange(_:)), name: .DisplayNameDidChange, object: nil) NotificationCenter.default.addObserver(self, selector: #selector(displayNameDidChange(_:)), name: .DisplayNameDidChange, object: nil)
NotificationCenter.default.addObserver(self, selector: #selector(childrenDidChange(_:)), name: .ChildrenDidChange, object: nil)
pullObjectsFromDisk() pullObjectsFromDisk()
@ -447,23 +448,34 @@ public final class Account: DisplayNameProvider, UnreadCountProvider, Container,
} }
} }
@objc func displayNameDidChange(_ note: Notification) { @objc func childrenDidChange(_ note: Notification) {
if let feed = note.object as? Feed, let feedAccount = feed.account, feedAccount === self { guard let object = note.object else {
return
}
if let account = object as? Account, account === self {
dirty = true dirty = true
} }
if let folder = note.object as? Folder, let folderAccount = folder.account, folderAccount === self { if let folder = object as? Folder, folder.account === self {
dirty = true
}
}
@objc func displayNameDidChange(_ note: Notification) {
if let feed = note.object as? Feed, feed.account === self {
dirty = true
}
if let folder = note.object as? Folder, folder.account === self {
dirty = true dirty = true
} }
} }
@objc func saveToDiskIfNeeded() { @objc func saveToDiskIfNeeded() {
guard dirty else { if dirty {
return saveToDisk()
} }
saveToDisk()
dirty = false
} }
// MARK: - Equatable // MARK: - Equatable
@ -563,6 +575,7 @@ private extension Account {
catch let error as NSError { catch let error as NSError {
NSApplication.shared.presentError(error) NSApplication.shared.presentError(error)
} }
dirty = false
} }
} }