From edfdc8576cff6b62460415ed774d11a756e3880e Mon Sep 17 00:00:00 2001 From: Nishanth T Date: Tue, 3 Nov 2020 22:18:08 +0530 Subject: [PATCH] Update MVMCoreLoadRequestOperation.m indentation and lifted out delegate obj --- .../LoadHandling/MVMCoreLoadRequestOperation.m | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/MVMCore/MVMCore/LoadHandling/MVMCoreLoadRequestOperation.m b/MVMCore/MVMCore/LoadHandling/MVMCoreLoadRequestOperation.m index 4209310..b66c75a 100644 --- a/MVMCore/MVMCore/LoadHandling/MVMCoreLoadRequestOperation.m +++ b/MVMCore/MVMCore/LoadHandling/MVMCoreLoadRequestOperation.m @@ -779,12 +779,11 @@ if ([loadObject.operation checkAndHandleForCancellation]) { return; } - DelegateObject *delegateObject = nil; + + // If we have an alert to show and a loaded view controller, allow the loaded view controller to be the delegate. + DelegateObject *delegateObject = [loadedViewController respondsToSelector:@selector(delegateObject)] ? [loadedViewController delegateObject] : loadObject.operation.delegateObject; // Show any alerts that we have been saving. if (loadObject.operation.alertToShow) { - - // If we have an alert to show and a loaded view controller, allow the loaded view controller to be the delegate. - delegateObject = [loadedViewController respondsToSelector:@selector(delegateObject)] ? [loadedViewController delegateObject] : loadObject.operation.delegateObject; [MVMCoreLoadRequestOperation createAndShowAlertForLoadObject:loadObject error:loadObject.operation.errorForAlertToShow delegateObject:delegateObject]; } @@ -796,10 +795,10 @@ } //make post load calls function - [MVMCoreLoadRequestOperation loadPostCallActions:loadObject]; - [MVMCoreLoadRequestOperation loadPostAction:loadObject delegateObject:delegateObject]; + [MVMCoreLoadRequestOperation loadPostCallActions:loadObject]; + [MVMCoreLoadRequestOperation loadPostAction:loadObject delegateObject:delegateObject]; - [loadObject.operation markAsFinished]; + [loadObject.operation markAsFinished]; }