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

Merge branch 'bugfix/xcode11' into 'develop'

Browse Source 
xcode 11 warnings

See merge request BPHV_MIPS/mvm_core!36
This commit is contained in:
Pfeil, Scott Robert 2019-10-08 14:08:36 -04:00
commit 93be02c000
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -287,7 +287,6 @@
operation.delegate = delegate; operation.delegate = delegate;
operation.completionBlock = completionBlock; operation.completionBlock = completionBlock;
[self.presentationQueue addOperation:operation]; [self.presentationQueue addOperation:operation];
} }
}]; }];
} }

14
MVMCore/MVMCore/PresentationHandling/MVMCorePresentViewControllerOperation.m
View File

@ -9,6 +9,7 @@
#import "MVMCorePresentViewControllerOperation.h" #import "MVMCorePresentViewControllerOperation.h"
#import "MVMCoreAlertController.h" #import "MVMCoreAlertController.h"
#import "MVMCorePresentAnimationOperation.h" #import "MVMCorePresentAnimationOperation.h"
#import "MVMCoreDispatchUtility.h"
@interface MVMCorePresentViewControllerOperation () @interface MVMCorePresentViewControllerOperation ()
@ -41,13 +42,14 @@ static void * XXContext = &XXContext;
} }
- (void)main { - (void)main {
[MVMCoreDispatchUtility performBlockOnMainThread:^{
// Always check for cancellation before launching the task.
if ([self checkAndHandleForCancellation]) {
return;
}
// Always check for cancellation before launching the task. [self present];
if ([self checkAndHandleForCancellation]) { }];
return;
}
[self present];
} }
- (void)present { - (void)present {