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

Merge branch 'bugfix/remove_no_page_error' into 'develop'

Browse Source 
Bugfix/remove no page error

See merge request BPHV_MIPS/mvm_core!171
This commit is contained in:
Pfeil, Scott Robert 2021-08-03 15:05:56 +00:00
commit 69f36cd3b0
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -166,15 +166,9 @@
// Can continue loading with the page. // Can continue loading with the page.
[MVMCoreLoadRequestOperation handleLoadObject:loadObject error:error]; [MVMCoreLoadRequestOperation handleLoadObject:loadObject error:error];
} else if (loadObject.operation.backgroundLoad || loadObject.requestParameters.noViewControllerToLoad || ([[MVMCoreObject sharedInstance].globalLoadDelegate respondsToSelector:@selector(hasContentToShow:error:)] && [[MVMCoreObject sharedInstance].globalLoadDelegate hasContentToShow:loadObject error:error])) { } else {
// Something to show, or nothing was expected to show, can finish. // Something to show, or nothing was expected to show, can finish.
[MVMCoreLoadRequestOperation loadFinished:loadObject loadedViewController:nil errorObject:error]; [MVMCoreLoadRequestOperation loadFinished:loadObject loadedViewController:nil errorObject:error];
} else {
// Error, foreground request with no page, alert, action, or anything else to show. Abort with error.
MVMCoreErrorObject *error = [[MVMCoreErrorObject alloc] initWithTitle:[MVMCoreGetterUtility hardcodedStringWithKey:HardcodedErrorTitle] message:[MVMCoreGetterUtility hardcodedStringWithKey:HardcodedErrorCritical] code:ErrorCodeNoPageType domain:ErrorDomainNative location:[[MVMCoreLoadHandler sharedGlobal] errorLocationForRequest:loadObject]];
[MVMCoreLoadRequestOperation loadAbortedWithError:error loadObject:loadObject];
} }
}]; }];
}]; }];