From d91e8a836540f772d0ad48a1649adaf06f61779b Mon Sep 17 00:00:00 2001 From: "Pfeil, Scott Robert" Date: Mon, 7 May 2018 16:12:39 -0400 Subject: [PATCH] to catch all scenarios --- .../PresentationHandling/MVMCoreNavigationOperation.m | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/MVMCore/MVMCore/PresentationHandling/MVMCoreNavigationOperation.m b/MVMCore/MVMCore/PresentationHandling/MVMCoreNavigationOperation.m index 19f2743..e53f5b2 100644 --- a/MVMCore/MVMCore/PresentationHandling/MVMCoreNavigationOperation.m +++ b/MVMCore/MVMCore/PresentationHandling/MVMCoreNavigationOperation.m @@ -206,12 +206,17 @@ - (void)markAsFinished { self.navigationObject.navigationController.delegate = nil; + if (self.navigationObject.stopLoadingOverlay) { + [[MVMCoreLoadingOverlayHandler sharedLoadingOverlay] stopLoading:YES]; + self.navigationObject.stopLoadingOverlay = NO; + } [super markAsFinished]; } - (void)navigationController:(UINavigationController *)navigationController willShowViewController:(UIViewController *)viewController animated:(BOOL)animated { if (self.navigationObject.stopLoadingOverlay) { [[MVMCoreLoadingOverlayHandler sharedLoadingOverlay] stopLoading:YES]; + self.navigationObject.stopLoadingOverlay = NO; } if (self.delegate && [self.delegate respondsToSelector:@selector(navigationController:willDisplayViewController:)]) { @@ -225,7 +230,6 @@ [self.delegate navigationController:navigationController displayedViewController:viewController]; } [self markAsFinished]; - } - (nullable id )navigationController:(UINavigationController *)navigationController animationControllerForOperation:(UINavigationControllerOperation)operation fromViewController:(UIViewController *)fromVC toViewController:(UIViewController *)toVC {