From 193f98cc1e03a3ac13bd261f090beec641920d36 Mon Sep 17 00:00:00 2001 From: Leon Styhre Date: Sat, 23 Dec 2023 23:14:25 +0100 Subject: [PATCH] (Android) Disabled the RunInBackground setting and corresponding menu option --- es-app/src/guis/GuiMenu.cpp | 2 ++ es-core/src/Settings.cpp | 2 ++ 2 files changed, 4 insertions(+) diff --git a/es-app/src/guis/GuiMenu.cpp b/es-app/src/guis/GuiMenu.cpp index 93e12ac42..b10551a9f 100644 --- a/es-app/src/guis/GuiMenu.cpp +++ b/es-app/src/guis/GuiMenu.cpp @@ -1472,6 +1472,7 @@ void GuiMenu::openOtherOptions() }); #endif +#if !defined(__ANDROID__) // Run ES in the background when a game has been launched. auto runInBackground = std::make_shared(); runInBackground->setState(Settings::getInstance()->getBool("RunInBackground")); @@ -1482,6 +1483,7 @@ void GuiMenu::openOtherOptions() s->setNeedsSaving(); } }); +#endif #if defined(VIDEO_HW_DECODING) // Whether to enable hardware decoding for the FFmpeg video player. diff --git a/es-core/src/Settings.cpp b/es-core/src/Settings.cpp index f5b69bafa..9fa11edd0 100644 --- a/es-core/src/Settings.cpp +++ b/es-core/src/Settings.cpp @@ -275,7 +275,9 @@ void Settings::setDefaults() #if defined(_WIN64) mBoolMap["HideTaskbar"] = {false, false}; #endif +#if !defined(__ANDROID__) mBoolMap["RunInBackground"] = {false, false}; +#endif #if defined(VIDEO_HW_DECODING) mBoolMap["VideoHardwareDecoding"] = {false, false}; #endif