Merge branch 'bugfix/poptocurrentpage' into 'develop'

if pop to current view controller, stop pop method

See merge request BPHV_MIPS/mvm_core!33
This commit is contained in:
Pfeil, Scott Robert 2019-10-15 11:54:09 -04:00
commit de6b6b3e6d

View File

@ -177,7 +177,7 @@
}
}
if (self.navigationObject.viewController) {
if (self.navigationObject.viewController && (self.navigationObject.viewController != self.navigationObject.navigationController.topViewController)) {
[self.navigationObject.navigationController popToViewController:self.navigationObject.viewController animated:self.navigationObject.animated];
} else {
[self markAsFinished];