From 887f8e0b53d3a0bf701564496f610c77b02277b3 Mon Sep 17 00:00:00 2001
From: Brent Simmons <brent@ranchero.com>
Date: Sun, 28 Jul 2019 16:00:43 -0700
Subject: [PATCH] =?UTF-8?q?Check=20to=20see=20if=20the=20timeline=20alread?=
 =?UTF-8?q?y=20has=20the=20expected=20representedObjects=20when=20the=20si?=
 =?UTF-8?q?debar=20selection=20(apparently)=20has=20changed.=20If=20so,=20?=
 =?UTF-8?q?then=20don=E2=80=99t=20set=20the=20representedObjects=20again,?=
 =?UTF-8?q?=20and=20don=E2=80=99t=20knock=20the=20user=20out=20of=20search?=
 =?UTF-8?q?=20mode=20if=20searching.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Mac/MainWindow/MainWindowController.swift     |  9 ++++---
 .../TimelineContainerViewController.swift     | 25 +++++++++++++++++++
 2 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/Mac/MainWindow/MainWindowController.swift b/Mac/MainWindow/MainWindowController.swift
index 18a965024..bc00c98d1 100644
--- a/Mac/MainWindow/MainWindowController.swift
+++ b/Mac/MainWindow/MainWindowController.swift
@@ -381,9 +381,12 @@ class MainWindowController : NSWindowController, NSUserInterfaceValidations {
 extension MainWindowController: SidebarDelegate {
 
 	func sidebarSelectionDidChange(_: SidebarViewController, selectedObjects: [AnyObject]?) {
-		// TODO: if searching, cancel search
-		timelineContainerViewController?.setRepresentedObjects(selectedObjects, mode: .regular)
-		forceSearchToEnd()
+		// Don’t update the timeline if it already has those objects.
+		let representedObjectsAreTheSame = timelineContainerViewController?.regularTimelineViewControllerHasRepresentedObjects(selectedObjects) ?? false
+		if !representedObjectsAreTheSame {
+			timelineContainerViewController?.setRepresentedObjects(selectedObjects, mode: .regular)
+			forceSearchToEnd()
+		}
 		updateWindowTitle()
 		NotificationCenter.default.post(name: .InspectableObjectsDidChange, object: nil)
 	}
diff --git a/Mac/MainWindow/Timeline/TimelineContainerViewController.swift b/Mac/MainWindow/Timeline/TimelineContainerViewController.swift
index a8fa3bb84..b4f3b3a27 100644
--- a/Mac/MainWindow/Timeline/TimelineContainerViewController.swift
+++ b/Mac/MainWindow/Timeline/TimelineContainerViewController.swift
@@ -54,6 +54,31 @@ final class TimelineContainerViewController: NSViewController {
 	func showTimeline(for mode: TimelineSourceMode) {
 		currentTimelineViewController = timelineViewController(for: mode)
 	}
+
+	func regularTimelineViewControllerHasRepresentedObjects(_ representedObjects: [AnyObject]?) -> Bool {
+		// Use this to find out if the regular timeline view already has the specified representedObjects.
+		// This is used in determining whether a search should end.
+		// The sidebar may think that the selection has changed, and therefore search should end —
+		// but it could be that the regular timeline already has these representedObjects,
+		// and therefore the selection hasn’t actually changed,
+		// and therefore search shouldn’t end.
+		// https://github.com/brentsimmons/NetNewsWire/issues/791
+		if representedObjects == nil && regularTimelineViewController.representedObjects == nil {
+			return true
+		}
+		guard let currentObjects = regularTimelineViewController.representedObjects, let representedObjects = representedObjects else {
+			return false
+		}
+		if currentObjects.count != representedObjects.count {
+			return false
+		}
+		for object in representedObjects {
+			guard let _ = currentObjects.firstIndex(where: { $0 === object } ) else {
+				return false
+			}
+		}
+		return true
+	}
 }
 
 extension TimelineContainerViewController: TimelineDelegate {