Merge branch 'bugfix/main_thread_fix' into 'release/6_21'

Move self.presentingViewController access onto the main thread.

See merge request BPHV_MIPS/mvm_core_ui!150
This commit is contained in:
Pfeil, Scott Robert 2019-10-11 13:03:42 -04:00
commit 2273d76c1f

View File

@ -67,11 +67,13 @@
}
- (void)dismiss {
if (self.presentingViewController) {
[[MVMCoreNavigationHandler sharedNavigationHandler] dismissViewController:self animated:YES];
} else if (self.navigationController) {
[[MVMCoreNavigationHandler sharedNavigationHandler] popViewController:self animated:YES];
}
[MVMCoreDispatchUtility performBlockOnMainThread:^{
if (self.presentingViewController) {
[[MVMCoreNavigationHandler sharedNavigationHandler] dismissViewController:self animated:YES];
} else if (self.navigationController) {
[[MVMCoreNavigationHandler sharedNavigationHandler] popViewController:self animated:YES];
}
}];
}
- (BOOL)isVisibleViewController {