Merge branch 'bugfix/main_thread_issue_fix' into 'develop'

presentedViewController must be used on main thread only

See merge request BPHV_MIPS/mvm_core!113
This commit is contained in:
Pfeil, Scott Robert 2020-10-09 11:29:31 -04:00
commit cd2e2b9a96

View File

@ -117,11 +117,14 @@
} }
- (void)removeCurrentViewController { - (void)removeCurrentViewController {
if (self.viewControllerToPresentOn.presentedViewController) { [MVMCoreDispatchUtility performBlockOnMainThread:^{
[[MVMCoreNavigationHandler sharedNavigationHandler] dismissTopViewControllerAnimated:YES]; // presentedViewController must be used on main thread
} else { if (self.viewControllerToPresentOn.presentedViewController) {
[[MVMCoreNavigationHandler sharedNavigationHandler] popTopViewControllerAnimated:YES]; [[MVMCoreNavigationHandler sharedNavigationHandler] dismissTopViewControllerAnimated:YES];
} } else {
[[MVMCoreNavigationHandler sharedNavigationHandler] popTopViewControllerAnimated:YES];
}
}];
} }
#pragma mark - Navigation Simple #pragma mark - Navigation Simple