Skip the current folder for next unread

This commit is contained in:
Maurice Parker 2020-07-27 21:01:32 -05:00
parent 66f8180006
commit ecefe59a5e
2 changed files with 2 additions and 1 deletions

View File

@ -289,6 +289,7 @@ private extension SidebarModel {
section.visit { sidebarItem in section.visit { sidebarItem in
if !foundStartFeed && sidebarItem.feed?.feedID == startingAt.feedID { if !foundStartFeed && sidebarItem.feed?.feedID == startingAt.feedID {
foundStartFeed = true foundStartFeed = true
return false
} }
if foundStartFeed && sidebarItem.unreadCount > 0 { if foundStartFeed && sidebarItem.unreadCount > 0 {
nextSidebarItem = sidebarItem nextSidebarItem = sidebarItem

View File

@ -75,7 +75,7 @@ class TimelineModel: ObservableObject, UndoableCommandRunner {
func goToNextUnread() -> Bool { func goToNextUnread() -> Bool {
var startIndex: Int var startIndex: Int
if let index = selectedTimelineItems.sorted(by: { $0.position < $1.position }).first?.position { if let index = selectedTimelineItems.sorted(by: { $0.position < $1.position }).first?.position {
startIndex = index startIndex = index + 1
} else { } else {
startIndex = 0 startIndex = 0
} }