From 374a66dd7620ee1d01f0299e2b78a7611e3efaea Mon Sep 17 00:00:00 2001
From: Leon Styhre <leon@leonstyhre.com>
Date: Sat, 19 Feb 2022 17:16:38 +0100
Subject: [PATCH] Removed the 'Play videos immediately' setting.

---
 es-app/src/guis/GuiMenu.cpp | 13 -------------
 es-core/src/Settings.cpp    |  3 +--
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/es-app/src/guis/GuiMenu.cpp b/es-app/src/guis/GuiMenu.cpp
index 5839a6032..803bca5a5 100644
--- a/es-app/src/guis/GuiMenu.cpp
+++ b/es-app/src/guis/GuiMenu.cpp
@@ -690,19 +690,6 @@ void GuiMenu::openUIOptions()
         }
     });
 
-    // Play videos immediately (overrides theme setting).
-    auto play_videos_immediately = std::make_shared<SwitchComponent>();
-    play_videos_immediately->setState(Settings::getInstance()->getBool("PlayVideosImmediately"));
-    s->addWithLabel("PLAY VIDEOS IMMEDIATELY (OVERRIDE THEME)", play_videos_immediately);
-    s->addSaveFunc([play_videos_immediately, s] {
-        if (Settings::getInstance()->getBool("PlayVideosImmediately") !=
-            play_videos_immediately->getState()) {
-            Settings::getInstance()->setBool("PlayVideosImmediately",
-                                             play_videos_immediately->getState());
-            s->setNeedsSaving();
-        }
-    });
-
     // When the theme set entries are scrolled or selected, update the relevant rows.
     auto scrollThemeSetFunc = [=](const std::string& themeName, bool firstRun = false) {
         auto selectedSet = themeSets.find(themeName);
diff --git a/es-core/src/Settings.cpp b/es-core/src/Settings.cpp
index 57b9ba94f..6a02f0cb6 100644
--- a/es-core/src/Settings.cpp
+++ b/es-core/src/Settings.cpp
@@ -192,8 +192,6 @@ void Settings::setDefaults()
     mBoolMap["GamelistFilters"] = {true, true};
     mBoolMap["QuickSystemSelect"] = {true, true};
     mBoolMap["ShowHelpPrompts"] = {true, true};
-    mBoolMap["PlayVideosImmediately"] = {false, false};
-    mBoolMap["EnableMenuKidMode"] = {false, false};
 
     // Sound settings.
     mIntMap["SoundVolumeNavigation"] = {70, 70};
@@ -243,6 +241,7 @@ void Settings::setDefaults()
     mBoolMap["DisableComposition"] = {true, true};
 #endif
     mBoolMap["DisplayGPUStatistics"] = {false, false};
+    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__)