From 97b951892997b69d6cf8bec0934fea9f86c5f732 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Thu, 7 Jan 2021 23:16:17 -0800 Subject: [PATCH] UI: Prevent self-powerdown check on load new game. Sometimes, when loading a new game or dump while an existing one is running, we'd detect the "powerdown" and force back to the menu. This was a race condition. --- UI/EmuScreen.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/UI/EmuScreen.cpp b/UI/EmuScreen.cpp index a84de656d7..bb5a62492e 100644 --- a/UI/EmuScreen.cpp +++ b/UI/EmuScreen.cpp @@ -420,6 +420,8 @@ void EmuScreen::sendMessage(const char *message, const char *value) { PSP_Shutdown(); bootPending_ = true; gamePath_ = value; + // Don't leave it on CORE_POWERDOWN, we'll sometimes aggressively bail. + Core_UpdateState(CORE_POWERUP); } } else if (!strcmp(message, "config_loaded")) { // In case we need to position touch controls differently.