Core: Shutdown properly on load failure.

This commit is contained in:
Unknown W. Brackets 2018-05-20 14:15:09 -07:00
parent 3c066de158
commit 9b6dee126d

View File

@ -351,13 +351,17 @@ bool PSP_InitUpdate(std::string *error_string) {
PSP_SetLoading("Starting graphics..."); PSP_SetLoading("Starting graphics...");
success = GPU_Init(coreParameter.graphicsContext, coreParameter.thin3d); success = GPU_Init(coreParameter.graphicsContext, coreParameter.thin3d);
if (!success) { if (!success) {
PSP_Shutdown();
*error_string = "Unable to initialize rendering engine."; *error_string = "Unable to initialize rendering engine.";
} }
} }
pspIsInited = success && GPU_IsReady(); if (!success) {
pspIsIniting = success && !pspIsInited; PSP_Shutdown();
return !success || pspIsInited; return true;
}
pspIsInited = GPU_IsReady();
pspIsIniting = !pspIsInited;
return pspIsInited;
} }
bool PSP_Init(const CoreParameter &coreParam, std::string *error_string) { bool PSP_Init(const CoreParameter &coreParam, std::string *error_string) {