Mirror/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-10-01 14:58:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #20424 from hrydgard/logging-fix

Browse Source 
Unload Retroachievements before we shut down the emulated PSP instead of the opposite.
This commit is contained in:
Henrik Rydgård authored and GitHub committed 2025-05-30 23:02:50 +02:00
2 parents 61c02466f8 0b8f22afde
commit fb8151f860
1 file changed
+6 -6
Download Patch File Download Diff File Expand all files Collapse all files
UI/EmuScreen.cpp
+6 -6
View File
@@ -445,8 +445,8 @@ EmuScreen::~EmuScreen() {
// Should not be able to quit during boot, as boot can't be cancelled.
_dbg_assert_(!bootPending_);
if (!bootPending_) {
PSP_Shutdown(true);
Achievements::UnloadGame();
PSP_Shutdown(true);
}
_dbg_assert_(coreState == CORE_POWERDOWN);
@@ -539,16 +539,16 @@ void EmuScreen::sendMessage(UIMessage message, const char *value) {
WARN_LOG(Log::Loader, "Can't stop during a pending boot");
return;
}
PSP_Shutdown(true);
Achievements::UnloadGame();
PSP_Shutdown(true);
System_Notify(SystemNotification::DISASSEMBLY);
} else if (message == UIMessage::REQUEST_GAME_RESET) {
if (bootPending_) {
WARN_LOG(Log::Loader, "Can't reset during a pending boot");
return;
}
PSP_Shutdown(true);
Achievements::UnloadGame();
PSP_Shutdown(true);
// Restart the boot process
bootPending_ = true;
@@ -584,8 +584,8 @@ void EmuScreen::sendMessage(UIMessage message, const char *value) {
System_Notify(SystemNotification::DISASSEMBLY);
});
} else {
PSP_Shutdown(true);
Achievements::UnloadGame();
PSP_Shutdown(true);
// OK, now pop any open settings screens and stuff that are running above us.
// Otherwise, we can get strange results with game-specific settings.
@@ -1473,8 +1473,8 @@ bool EmuScreen::checkPowerDown() {
if (coreState == CORE_POWERDOWN && PSP_GetBootState() == BootState::Complete && !bootPending_) {
bool shutdown = false;
if (PSP_IsInited()) {
PSP_Shutdown(true);
Achievements::UnloadGame();
PSP_Shutdown(true);
shutdown = true;
}
INFO_LOG(Log::System, "SELF-POWERDOWN!");
@@ -1731,8 +1731,8 @@ ScreenRenderFlags EmuScreen::render(ScreenRenderMode mode) {
}
if (SaveState::PollRestartNeeded() && !bootPending_) {
PSP_Shutdown(true);
Achievements::UnloadGame();
PSP_Shutdown(true);
// Restart the boot process
bootPending_ = true;