From 43bd436225293604528326a4cb1799627dd37e32 Mon Sep 17 00:00:00 2001
From: "Pfeil, Scott Robert" <scott.pfeil3@verizonwireless.com>
Date: Thu, 8 Oct 2020 11:31:40 -0400
Subject: [PATCH] Added view controller getter.

---
 MVMCoreUI/Containers/NavigationController.swift                 | 2 +-
 .../MVMCoreUISplitViewController+Extension.swift                | 2 +-
 .../SplitViewController/MVMCoreUISplitViewController.m          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/MVMCoreUI/Containers/NavigationController.swift b/MVMCoreUI/Containers/NavigationController.swift
index 89ea446c..681642f8 100644
--- a/MVMCoreUI/Containers/NavigationController.swift
+++ b/MVMCoreUI/Containers/NavigationController.swift
@@ -59,7 +59,7 @@ import UIKit
         var leftItems: [UIBarButtonItem] = []
         if navigationItemModel.alwaysShowBackButton != false {
             if let backButtonModel = navigationItemModel.backButton,
-                navigationController.viewControllers.count > 1 || navigationItemModel.alwaysShowBackButton ?? false {
+               MVMCoreNavigationHandler.shared()?.getViewControllers(for: navigationController)?.count ?? 0 > 1 || navigationItemModel.alwaysShowBackButton ?? false {
                 leftItems.append(backButtonModel.createNavigationItemButton(delegateObject: delegate, additionalData: nil))
             }
             if let leftItemModels = navigationItemModel.additionalLeftButtons {
diff --git a/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController+Extension.swift b/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController+Extension.swift
index 8e14720d..2f452647 100644
--- a/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController+Extension.swift
+++ b/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController+Extension.swift
@@ -48,7 +48,7 @@ public extension MVMCoreUISplitViewController {
         if let forceBackButton = navigationItemModel?.alwaysShowBackButton {
             showBackButton = forceBackButton
         } else {
-            showBackButton = navigationController.viewControllers.count > 1
+            showBackButton = MVMCoreNavigationHandler.shared()?.getViewControllers(for: navigationController)?.count ?? 0 > 1
         }
         if showBackButton {
             if let backButtonModel = navigationItemModel?.backButton {
diff --git a/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m b/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m
index 177d0b8a..d88641fa 100644
--- a/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m
+++ b/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m
@@ -241,7 +241,7 @@ CGFloat const PanelAnimationDuration = 0.2;
 
 - (void)setLeftNavigationItemForViewController:(UIViewController * _Nonnull)viewController accessible:(BOOL)accessible extended:(BOOL)extended {
     NSMutableArray *leftBarButtonItems = [NSMutableArray array];
-    if ([viewController.navigationController.viewControllers count] > 1) {
+    if (viewController.navigationController && [MVMCoreNavigationHandler.sharedNavigationHandler getViewControllersForNavigationController:viewController.navigationController].count > 1) {
         [leftBarButtonItems addObject:self.backButton];
     }
     if ((accessible && !extended) && self.leftPanelButton) {