From ecefe59a5efa01aa9224e88e567177f653d6d0f9 Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Mon, 27 Jul 2020 21:01:32 -0500 Subject: [PATCH] Skip the current folder for next unread --- Multiplatform/Shared/Sidebar/SidebarModel.swift | 1 + Multiplatform/Shared/Timeline/TimelineModel.swift | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Multiplatform/Shared/Sidebar/SidebarModel.swift b/Multiplatform/Shared/Sidebar/SidebarModel.swift index a4fabbad4..24d93c825 100644 --- a/Multiplatform/Shared/Sidebar/SidebarModel.swift +++ b/Multiplatform/Shared/Sidebar/SidebarModel.swift @@ -289,6 +289,7 @@ private extension SidebarModel { section.visit { sidebarItem in if !foundStartFeed && sidebarItem.feed?.feedID == startingAt.feedID { foundStartFeed = true + return false } if foundStartFeed && sidebarItem.unreadCount > 0 { nextSidebarItem = sidebarItem diff --git a/Multiplatform/Shared/Timeline/TimelineModel.swift b/Multiplatform/Shared/Timeline/TimelineModel.swift index 307137c8e..b96e5422a 100644 --- a/Multiplatform/Shared/Timeline/TimelineModel.swift +++ b/Multiplatform/Shared/Timeline/TimelineModel.swift @@ -75,7 +75,7 @@ class TimelineModel: ObservableObject, UndoableCommandRunner { func goToNextUnread() -> Bool { var startIndex: Int if let index = selectedTimelineItems.sorted(by: { $0.position < $1.position }).first?.position { - startIndex = index + startIndex = index + 1 } else { startIndex = 0 }