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

Merge branch 'release/6_21' into 'develop'

Browse Source 
Release/6 21

See merge request BPHV_MIPS/mvm_core_ui!155
This commit is contained in:
Pan, Xinlei (Ryan) 2019-10-21 15:34:13 -04:00
commit 0b1a1b5d73
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 {