mbrucedogs/mvm_core_ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
MVMCoreUI/BaseControllers/MFViewController.m
View File

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