From c5caab290eb8cb7539644bd9b1c05b927dc3cc38 Mon Sep 17 00:00:00 2001 From: Leon Styhre Date: Sat, 23 Dec 2023 23:28:22 +0100 Subject: [PATCH] (Android) Disabled the quit menu --- es-app/src/guis/GuiMenu.cpp | 4 ++-- es-core/src/Settings.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/es-app/src/guis/GuiMenu.cpp b/es-app/src/guis/GuiMenu.cpp index b10551a9f..d110f7d83 100644 --- a/es-app/src/guis/GuiMenu.cpp +++ b/es-app/src/guis/GuiMenu.cpp @@ -72,7 +72,7 @@ GuiMenu::GuiMenu() if (!Settings::getInstance()->getBool("ForceKiosk") && Settings::getInstance()->getString("UIMode") != "kiosk") { -#if defined(__APPLE__) +#if defined(__APPLE__) || defined(__ANDROID__) addEntry("QUIT ES-DE", mMenuColorPrimary, false, [this] { openQuitMenu(); }); #else if (Settings::getInstance()->getBool("ShowQuitMenu")) @@ -1669,7 +1669,7 @@ void GuiMenu::openOtherOptions() // macOS requires root privileges to reboot and power off so it doesn't make much // sense to enable this setting and menu entry for that operating system. -#if !defined(__APPLE__) +#if !defined(__APPLE__) && !defined(__ANDROID__) // Whether to show the quit menu with the options to reboot and shutdown the computer. auto showQuitMenu = std::make_shared(); showQuitMenu->setState(Settings::getInstance()->getBool("ShowQuitMenu")); diff --git a/es-core/src/Settings.cpp b/es-core/src/Settings.cpp index 9fa11edd0..081a4b65d 100644 --- a/es-core/src/Settings.cpp +++ b/es-core/src/Settings.cpp @@ -300,7 +300,7 @@ void Settings::setDefaults() mBoolMap["EnableMenuKidMode"] = {false, false}; // macOS requires root privileges to reboot and power off so it doesn't make much // sense to enable this setting and menu entry for that operating system. -#if !defined(__APPLE__) +#if !defined(__APPLE__) && !defined(__ANDROID__) mBoolMap["ShowQuitMenu"] = {false, false}; #endif