From a93b5f8f6269e96785be053d3e4c1430f143139d Mon Sep 17 00:00:00 2001 From: icenine451 Date: Thu, 13 Apr 2023 09:26:04 -0400 Subject: [PATCH] Update patch to known working version --- .../es-de/es-de-retrodeck-mods.patch | 32 ++++++++++++------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/rd-submodules/es-de/es-de-retrodeck-mods.patch b/rd-submodules/es-de/es-de-retrodeck-mods.patch index 941e7b03..c029baee 100644 --- a/rd-submodules/es-de/es-de-retrodeck-mods.patch +++ b/rd-submodules/es-de/es-de-retrodeck-mods.patch @@ -1,39 +1,49 @@ -diff -au1r emulationstation-de/es-app/src/guis/GuiMenu.cpp emulationstation-de/es-app/src/guis/GuiMenu.cpp +diff -au1r emulationstation-de/es-app/src/guis/GuiMenu.cpp emulationstation-de-patched/es-app/src/guis/GuiMenu.cpp --- emulationstation-de/es-app/src/guis/GuiMenu.cpp 2023-04-12 09:08:12.394935336 -0400 -+++ emulationstation-de/es-app/src/guis/GuiMenu.cpp 2023-04-12 10:08:50.433350606 -0400 -@@ -66,2 +66,4 @@ ++++ emulationstation-de-patched/es-app/src/guis/GuiMenu.cpp 2023-04-12 16:18:59.249278398 -0400 +@@ -10,2 +10,3 @@ + #include "guis/GuiMenu.h" ++#include "utils/PlatformUtil.h" -+ addEntry("RETRODECK CONFIGURATOR", 0x777777FF, true, [this] { openRetroDeckConfigurator(); }); +@@ -66,2 +67,4 @@ + ++ addEntry("RETRODECK CONFIGURATOR", 0x777777FF, false, [this] { openRetroDeckConfigurator(); }); + if (!Settings::getInstance()->getBool("ForceKiosk") && -@@ -69,3 +71,3 @@ +@@ -69,3 +72,3 @@ #if defined(__APPLE__) - addEntry("QUIT EMULATIONSTATION", 0x777777FF, false, [this] { openQuitMenu(); }); + addEntry("QUIT RETRODECK", 0x777777FF, false, [this] { openQuitMenu(); }); #else -@@ -74,3 +76,3 @@ +@@ -74,3 +77,3 @@ else - addEntry("QUIT EMULATIONSTATION", 0x777777FF, false, [this] { openQuitMenu(); }); + addEntry("QUIT RETRODECK", 0x777777FF, false, [this] { openQuitMenu(); }); #endif -@@ -1704,2 +1706,9 @@ +@@ -1704,2 +1707,15 @@ +void GuiMenu::openRetroDeckConfigurator() +{ + // Launch the configurator.sh script -+ int result = system("/app/tools/configurator.sh"); ++ std::string command; ++ std::string startDirectory; ++ bool runInBackground; ++ command = "bash /app/tools/configurator.sh"; ++ startDirectory = "/app/tools"; ++ runInBackground = false; ++ int result = Utils::Platform::launchGameUnix(command, startDirectory, runInBackground); + // You can add any checks for the script's outcome here. +} + void GuiMenu::openQuitMenu() -@@ -1732,3 +1741,3 @@ +@@ -1732,3 +1748,3 @@ }); - auto quitText = std::make_shared("QUIT EMULATIONSTATION", + auto quitText = std::make_shared("QUIT RETRODECK", Font::get(FONT_SIZE_MEDIUM), 0x777777FF); -diff -au1r emulationstation-de/es-app/src/guis/GuiMenu.h emulationstation-de/es-app/src/guis/GuiMenu.h +diff -au1r emulationstation-de/es-app/src/guis/GuiMenu.h emulationstation-de-patched/es-app/src/guis/GuiMenu.h --- emulationstation-de/es-app/src/guis/GuiMenu.h 2023-04-12 09:08:12.394935336 -0400 -+++ emulationstation-de/es-app/src/guis/GuiMenu.h 2023-04-12 09:33:25.023871033 -0400 ++++ emulationstation-de-patched/es-app/src/guis/GuiMenu.h 2023-04-12 09:33:25.023871033 -0400 @@ -46,2 +46,3 @@ void openOtherOptions(); + void openRetroDeckConfigurator();