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 develop

Browse Source
This commit is contained in:
Pfeil, Scott Robert 2020-10-15 12:18:50 -04:00
commit e9abe2121a
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
MVMCore/MVMCore/PresentationHandling/MVMCoreNavigationHandler.m
View File

@ -266,15 +266,11 @@
- (nullable NSArray<UIViewController *> *)getViewControllersForNavigationController:(nullable UINavigationController *)navigationController {
// Check if we are currently animating.
NSInteger index = [self.navigationQueue.operations indexOfObjectPassingTest:^BOOL(__kindof MVMCoreNavigationOperation * _Nonnull operation, NSUInteger idx, BOOL * _Nonnull stop) {
if (operation.isExecuting) {
*stop = YES;
return YES;
} else {
return NO;
}
return operation.isExecuting && [operation isKindOfClass:[MVMCoreNavigationOperation class]];
}];
if (index != NSNotFound) {
// Test above ensures we have an MVMCoreNavigationOperation. There are situations where block operations are submitted to the queue to be executed.
MVMCoreNavigationOperation *operation = [self.navigationQueue.operations objectAtIndex:index];
if (operation.navigationObject.navigationController == navigationController && operation.futureViewControllers) {
// Return the future state if animating.