From 2217dc492f47043184766262c177da622ec9fa87 Mon Sep 17 00:00:00 2001
From: Maurice Parker <mo@vincode.io>
Date: Sun, 26 Jul 2020 07:54:04 -0500
Subject: [PATCH] Moved title update to the correct func for subscription

---
 .../Shared/Timeline/TimelineModel.swift       | 31 ++++++++++---------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/Multiplatform/Shared/Timeline/TimelineModel.swift b/Multiplatform/Shared/Timeline/TimelineModel.swift
index 1f690e859..6870984c7 100644
--- a/Multiplatform/Shared/Timeline/TimelineModel.swift
+++ b/Multiplatform/Shared/Timeline/TimelineModel.swift
@@ -147,6 +147,21 @@ private extension TimelineModel {
 	func subscribeToReadFilterAndFeedChanges() {
 		guard let selectedFeedsPublisher = delegate?.selectedFeedsPublisher else { return }
 		
+		// Set the timeline name for display
+		selectedFeedsPublisher
+			.map { feeds -> String in
+				switch feeds.count {
+				case 0:
+					return ""
+				case 1:
+					return feeds.first!.nameForDisplay
+				default:
+					return NSLocalizedString("Multiple", comment: "Multiple")
+				}
+			}
+			.assign(to: &$nameForDisplay)
+
+		// Clear the selected timeline items when the selected feed(s) change
 		selectedFeedsPublisher
 			.sink { [weak self] _ in
 				self?.selectedTimelineItemIDs = Set<String>()
@@ -193,8 +208,7 @@ private extension TimelineModel {
 	}
 	
 	func subscribeToArticleFetchChanges() {
-		guard let readFilterAndFeedsPublisher = readFilterAndFeedsPublisher,
-			  let selectedFeedsPublisher = delegate?.selectedFeedsPublisher else { return }
+		guard let readFilterAndFeedsPublisher = readFilterAndFeedsPublisher else { return }
 		
 		let sortDirectionPublisher = sortDirectionSubject.removeDuplicates()
 		let groupByPublisher = groupByFeedSubject.removeDuplicates()
@@ -225,19 +239,6 @@ private extension TimelineModel {
 			.share()
 			.eraseToAnyPublisher()
 		
-		// Set the timeline name for display
-		selectedFeedsPublisher
-			.map { feeds -> String in
-				switch feeds.count {
-				case 0:
-					return ""
-				case 1:
-					return feeds.first!.nameForDisplay
-				default:
-					return NSLocalizedString("Multiple", comment: "Multiple")
-				}
-			}
-			.assign(to: &$nameForDisplay)
 	}
 	
 	func subscribeToArticleSelectionChanges() {