From 98f55d4bc581b862d150e6421f417d8906292bcc Mon Sep 17 00:00:00 2001 From: Scott Pfeil Date: Wed, 31 Jan 2024 09:18:36 -0500 Subject: [PATCH 1/2] add missing error screen --- MVMCore/MVMCore/LoadHandling/MVMCoreLoadRequestOperation.m | 3 +++ 1 file changed, 3 insertions(+) diff --git a/MVMCore/MVMCore/LoadHandling/MVMCoreLoadRequestOperation.m b/MVMCore/MVMCore/LoadHandling/MVMCoreLoadRequestOperation.m index 382c5ca..61d4f84 100644 --- a/MVMCore/MVMCore/LoadHandling/MVMCoreLoadRequestOperation.m +++ b/MVMCore/MVMCore/LoadHandling/MVMCoreLoadRequestOperation.m @@ -766,6 +766,9 @@ error = [[MVMCoreLoadHandler sharedGlobal] errorForLoadObject:loadObject withTitle:[MVMCoreGetterUtility hardcodedStringWithKey:HardcodedErrorTitle] message:[MVMCoreGetterUtility hardcodedStringWithKey:HardcodedErrorCritical] code:ErrorCodeInitViewController domain:ErrorDomainNative]; } + if (error) { + error = [[MVMCoreLoadHandler sharedGlobal] attachLoadInformation:loadObject toError:error]; + } [MVMCoreLoadRequestOperation handleShouldContinue:shouldContinue error:error loadObject:loadObject errorBlock:NULL continueBlock:^{ completionHandler(viewController,loadObject); }]; From c89efeb3e79dd1cc43f99ead9ab25b12ab0256a6 Mon Sep 17 00:00:00 2001 From: Scott Pfeil Date: Wed, 31 Jan 2024 09:29:07 -0500 Subject: [PATCH 2/2] shift call to avoid duplication --- MVMCore/MVMCore/LoadHandling/MVMCoreLoadRequestOperation.m | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/MVMCore/MVMCore/LoadHandling/MVMCoreLoadRequestOperation.m b/MVMCore/MVMCore/LoadHandling/MVMCoreLoadRequestOperation.m index 61d4f84..e2ab27b 100644 --- a/MVMCore/MVMCore/LoadHandling/MVMCoreLoadRequestOperation.m +++ b/MVMCore/MVMCore/LoadHandling/MVMCoreLoadRequestOperation.m @@ -758,6 +758,9 @@ // Allows the view controller to handle specific errors (such as ensure it has all the required data). shouldContinue = [viewController shouldFinishProcessingLoad:loadObject error:&error]; + if (error) { + error = [[MVMCoreLoadHandler sharedGlobal] attachLoadInformation:loadObject toError:error]; + } if (!shouldContinue) { viewController = nil; } @@ -766,9 +769,6 @@ error = [[MVMCoreLoadHandler sharedGlobal] errorForLoadObject:loadObject withTitle:[MVMCoreGetterUtility hardcodedStringWithKey:HardcodedErrorTitle] message:[MVMCoreGetterUtility hardcodedStringWithKey:HardcodedErrorCritical] code:ErrorCodeInitViewController domain:ErrorDomainNative]; } - if (error) { - error = [[MVMCoreLoadHandler sharedGlobal] attachLoadInformation:loadObject toError:error]; - } [MVMCoreLoadRequestOperation handleShouldContinue:shouldContinue error:error loadObject:loadObject errorBlock:NULL continueBlock:^{ completionHandler(viewController,loadObject); }];