From 670ae92f04c0f74363a50634f89bcabc285f85aa Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Tue, 10 Sep 2019 17:18:10 -0500 Subject: [PATCH] FIx navigation feed clearing code so that it works in three panel mode --- iOS/SceneCoordinator.swift | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/iOS/SceneCoordinator.swift b/iOS/SceneCoordinator.swift index aa6a4b72b..c1a15241a 100644 --- a/iOS/SceneCoordinator.swift +++ b/iOS/SceneCoordinator.swift @@ -1049,16 +1049,17 @@ extension SceneCoordinator: UISplitViewControllerDelegate { // MARK: UINavigationControllerDelegate extension SceneCoordinator: UINavigationControllerDelegate { + func navigationController(_ navigationController: UINavigationController, didShow viewController: UIViewController, animated: Bool) { - if viewController === masterFeedViewController { + // If we are showing the Feeds and only the feeds start clearing stuff + if viewController === masterFeedViewController && !isThreePanelMode { activityManager.invalidateCurrentActivities() - if !rootSplitViewController.isCollapsed { - selectFeed(nil) - } + selectFeed(nil) } } + } // MARK: Private