preserve-emulation/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-10-13 06:20:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into master

Browse Source
This commit is contained in:
Bashar Astifan authored and GitHub committed 2023-08-01 05:29:56 +04:00
2 parents 9b4be1b3b0 aca739d8eb
commit 401377818c
249 files changed
+11459 -2236
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Core/System.cpp
+8 -6
View File
@@ -418,6 +418,10 @@ bool PSP_InitStart(const CoreParameter &coreParam, std::string *error_string) {
return false;
}
if (!Achievements::IsReadyToStart()) {
return false;
}
#if defined(_WIN32) && PPSSPP_ARCH(AMD64)
NOTICE_LOG(BOOT, "PPSSPP %s Windows 64 bit", PPSSPP_GIT_VERSION);
#elif defined(_WIN32) && !PPSSPP_ARCH(AMD64)
@@ -473,11 +477,6 @@ bool PSP_InitStart(const CoreParameter &coreParam, std::string *error_string) {
}
bool PSP_InitUpdate(std::string *error_string) {
if (Achievements::IsBlockingExecution()) {
// Keep waiting.
return false;
}
if (pspIsInited || !pspIsIniting) {
return true;
}
@@ -487,7 +486,10 @@ bool PSP_InitUpdate(std::string *error_string) {
}
bool success = !g_CoreParameter.fileToStart.empty();
*error_string = g_CoreParameter.errorString;
if (!g_CoreParameter.errorString.empty()) {
*error_string = g_CoreParameter.errorString;
}
if (success && gpu == nullptr) {
PSP_SetLoading("Starting graphics...");
Draw::DrawContext *draw = g_CoreParameter.graphicsContext ? g_CoreParameter.graphicsContext->GetDrawContext() : nullptr;