From af17112bf4ab819cd7f48dc3f7f6a986698f0e2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Wed, 13 Dec 2023 17:12:48 +0100 Subject: [PATCH] Expose --escape-exit and --pause-menu-exit to be set from the ini file You can now set --escape-exit by setting `PauseExitsEmulator = true` in [General]. You can now set --pause-menu-exit by setting `PauseMenuExitsEmulator = true` in [General]. --- Core/Config.cpp | 3 +++ Core/Config.h | 1 - UI/NativeApp.cpp | 2 -- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Core/Config.cpp b/Core/Config.cpp index 21667199ce..29c6781b47 100644 --- a/Core/Config.cpp +++ b/Core/Config.cpp @@ -289,6 +289,9 @@ static const ConfigSetting generalSettings[] = { #endif ConfigSetting("PauseWhenMinimized", &g_Config.bPauseWhenMinimized, false, CfgFlag::PER_GAME), + ConfigSetting("PauseExitsEmulator", &g_Config.bPauseExitsEmulator, false, CfgFlag::DONT_SAVE), + ConfigSetting("PauseMenuExitsEmulator", &g_Config.bPauseMenuExitsEmulator, false, CfgFlag::DONT_SAVE), + ConfigSetting("DumpDecryptedEboots", &g_Config.bDumpDecryptedEboot, false, CfgFlag::PER_GAME), ConfigSetting("FullscreenOnDoubleclick", &g_Config.bFullscreenOnDoubleclick, true, CfgFlag::DONT_SAVE), ConfigSetting("ShowMenuBar", &g_Config.bShowMenuBar, true, CfgFlag::DEFAULT), diff --git a/Core/Config.h b/Core/Config.h index d7fc96dcde..4ffd0d5633 100644 --- a/Core/Config.h +++ b/Core/Config.h @@ -97,7 +97,6 @@ public: bool bPauseWhenMinimized; - // Not used on mobile devices. bool bPauseExitsEmulator; bool bPauseMenuExitsEmulator; diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp index fab19c2b81..0e069c1c73 100644 --- a/UI/NativeApp.cpp +++ b/UI/NativeApp.cpp @@ -584,10 +584,8 @@ void NativeInit(int argc, const char *argv[], const char *savegame_dir, const ch fileToLog = argv[i] + strlen("--log="); if (!strncmp(argv[i], "--state=", strlen("--state=")) && strlen(argv[i]) > strlen("--state=")) stateToLoad = Path(std::string(argv[i] + strlen("--state="))); -#if !defined(MOBILE_DEVICE) if (!strncmp(argv[i], "--escape-exit", strlen("--escape-exit"))) g_Config.bPauseExitsEmulator = true; -#endif if (!strncmp(argv[i], "--pause-menu-exit", strlen("--pause-menu-exit"))) g_Config.bPauseMenuExitsEmulator = true; if (!strcmp(argv[i], "--fullscreen")) {