Merge branch 'bugfix/remove_no_page_error' into 'develop'
Bugfix/remove no page error See merge request BPHV_MIPS/mvm_core!171
This commit is contained in:
commit
69f36cd3b0
@ -166,15 +166,9 @@
|
||||
|
||||
// Can continue loading with the page.
|
||||
[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.
|
||||
[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];
|
||||
}
|
||||
}];
|
||||
}];
|
||||
|
||||
Loading…
Reference in New Issue
Block a user