From 66973bd4cb02573d04a54f5059e3113a61111a48 Mon Sep 17 00:00:00 2001 From: Scott Pfeil Date: Mon, 18 Oct 2021 17:03:26 -0400 Subject: [PATCH] added checks --- MVMCoreUI/Containers/NavigationController.swift | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/MVMCoreUI/Containers/NavigationController.swift b/MVMCoreUI/Containers/NavigationController.swift index c6a50fef..c2b63a6e 100644 --- a/MVMCoreUI/Containers/NavigationController.swift +++ b/MVMCoreUI/Containers/NavigationController.swift @@ -172,14 +172,15 @@ extension NavigationController: MVMCoreViewManagerProtocol { extension NavigationController: MVMCorePresentationDelegateProtocol { public func navigationController(_ navigationController: UINavigationController, prepareDisplayFor viewController: UIViewController) { - guard let newViewController = MVMCoreUIUtility.getViewControllerTraversingManagers(viewController) else { return } - if let model = getNavigationModel(from: newViewController) { - Self.setNavigationItem(navigationController: self, navigationItemModel: model, viewController: viewController) - } + guard self == navigationController, + let newViewController = MVMCoreUIUtility.getViewControllerTraversingManagers(viewController), + let model = getNavigationModel(from: newViewController) else { return } + Self.setNavigationItem(navigationController: self, navigationItemModel: model, viewController: viewController) } public func navigationController(_ navigationController: UINavigationController, willDisplay viewController: UIViewController) { - guard let newViewController = MVMCoreUIUtility.getViewControllerTraversingManagers(viewController) else { return } + guard self == navigationController, + let newViewController = MVMCoreUIUtility.getViewControllerTraversingManagers(viewController) else { return } if let controller = viewController as? (UIViewController & MVMCoreViewManagerViewControllerProtocol) { MVMCoreViewManagerViewControllerProtocolHelper.helpSetManager(self, viewController: controller) }