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

Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core into feature/remove_mdn_dependency

Browse Source
This commit is contained in:
Scott Pfeil 2021-11-09 11:50:57 -05:00
commit 324be22ad2
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
MVMCore/MVMCore/LoadHandling/MVMCoreLoadRequestOperation.m
View File

@ -884,8 +884,13 @@
}
}
- (void)navigationController:(UINavigationController *)navigationController interactiveTransitionWasCanceled:(BOOL)canceled {
if (self.delegateObject.presentationDelegate && [self.delegateObject.presentationDelegate respondsToSelector:@selector(navigationController:interactiveTransitionWasCanceled:)]) {
[self.delegateObject.presentationDelegate navigationController:navigationController interactiveTransitionWasCanceled:canceled];
}
}
- (void)viewController:(UIViewController *)presentingViewController willPresentViewController:(UIViewController *)presentedViewController {
if ([self.delegateObject.presentationDelegate respondsToSelector:@selector(viewController:willPresentViewController:)]) {
[self.delegateObject.presentationDelegate viewController:presentingViewController willPresentViewController:presentedViewController];
}

2
MVMCore/MVMCore/Models/ActionType/Client Parameters/ClientParameterHandler.swift
View File

@ -18,7 +18,7 @@
return parameterType.init(clientParameterModel)
} catch {
if let errorObject = MVMCoreErrorObject.createErrorObject(for: error, location: #function) {
MVMCoreLoggingHandler.shared()?.addError(toLog: errorObject)
MVMCoreLoggingHandler.addError(toLog: errorObject)
}
return nil
}