From b0a2f204314c8e78ae7282cb5a64543bef1f661e Mon Sep 17 00:00:00 2001
From: icenine451 <benjamin.r.shelton@protonmail.com>
Date: Thu, 26 Oct 2023 09:29:01 -0400
Subject: [PATCH 1/2] Update ESDE patch

---
 rd-submodules/es-de/ViewController.cpp.patch | 28 +++++++++++++-------
 rd-submodules/retroarch                      |  2 +-
 rd-submodules/shared-modules                 |  2 +-
 3 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/rd-submodules/es-de/ViewController.cpp.patch b/rd-submodules/es-de/ViewController.cpp.patch
index 77c44b8a..a54202b3 100644
--- a/rd-submodules/es-de/ViewController.cpp.patch
+++ b/rd-submodules/es-de/ViewController.cpp.patch
@@ -1,6 +1,22 @@
---- /tmp/emulationstation-de/es-app/src/views/ViewController.cpp	2023-10-21 19:46:36.202758979 +0200
-+++ ./patches-tmp/ViewController.cpp	2023-10-21 22:21:04.737925284 +0200
-@@ -195,96 +195,5 @@
+diff -au1r emulationstation-de/es-app/src/views/ViewController.cpp emulationstation-de/es-app/src/views/ViewController.cpp
+--- emulationstation-de/es-app/src/views/ViewController.cpp	2023-10-24 13:44:56.767947794 -0400
++++ emulationstation-de/es-app/src/views/ViewController.cpp	2023-10-24 14:07:45.665387904 -0400
+@@ -180,9 +180,7 @@
+ {
+-    mNoGamesErrorMessage = "NO GAME FILES WERE FOUND. EITHER PLACE YOUR GAMES IN "
+-                           "THE CURRENTLY CONFIGURED ROM DIRECTORY OR CHANGE "
+-                           "ITS PATH USING THE BUTTON BELOW. OPTIONALLY THE ROM "
+-                           "DIRECTORY STRUCTURE CAN BE GENERATED WHICH WILL "
+-                           "CREATE A TEXT FILE FOR EACH SYSTEM PROVIDING SOME "
+-                           "INFORMATION SUCH AS THE SUPPORTED FILE EXTENSIONS.\n"
+-                           "THIS IS THE CURRENTLY CONFIGURED ROM DIRECTORY:\n";
++    mNoGamesErrorMessage = "RETRODECK COULD NOT FIND ANY ROM FILES. "
++                           "PLEASE PLACE YOUR ROM FILES INTO THE APPROPRIATE "
++                           "SYSTEM SUBFOLDER IN THE CONFIGURED ROM DIRECTORY "
++                           "AND RUN RETRODECK AGAIN TO SCAN YOUR LIBRARY.\n"
++                           "THE CURRENTLY CONFIGURED ROM DIRECTORY IS:\n";
+ 
+@@ -195,91 +193,3 @@
      mNoGamesMessageBox = new GuiMsgBox(
 -        HelpStyle(), mNoGamesErrorMessage + mRomDirectory, "CHANGE ROM DIRECTORY",
 -        [this] {
@@ -93,9 +109,3 @@
 -        "QUIT",
 +        HelpStyle(), mNoGamesErrorMessage + mRomDirectory, "QUIT",
          [] {
--            SDL_Event quit;
--            quit.type = SDL_QUIT;
--            SDL_PushEvent(&quit);
--        },
-+        },    
-         nullptr, true, false,
diff --git a/rd-submodules/retroarch b/rd-submodules/retroarch
index 9dc43930..0b1cfb79 160000
--- a/rd-submodules/retroarch
+++ b/rd-submodules/retroarch
@@ -1 +1 @@
-Subproject commit 9dc439300e92338d5b2bc3fc680eedd4fe1d3b0c
+Subproject commit 0b1cfb79e591e10488a3262d6b38db843c39a409
diff --git a/rd-submodules/shared-modules b/rd-submodules/shared-modules
index 76809270..a2441b96 160000
--- a/rd-submodules/shared-modules
+++ b/rd-submodules/shared-modules
@@ -1 +1 @@
-Subproject commit 76809270588f87c6c14df96fef2dde9a7bac84f4
+Subproject commit a2441b964afefd8cd1cebcdf562c7878670daf42

From 68f7d59ff4f2f4b0ea6048308c932e2f87afc1c1 Mon Sep 17 00:00:00 2001
From: icenine451 <59938822+icenine451@users.noreply.github.com>
Date: Sat, 4 Nov 2023 15:17:08 -0400
Subject: [PATCH 2/2] Another ES-DE patch attempt

---
 rd-submodules/es-de/ViewController.cpp.patch | 26 ++++++--------------
 1 file changed, 8 insertions(+), 18 deletions(-)

diff --git a/rd-submodules/es-de/ViewController.cpp.patch b/rd-submodules/es-de/ViewController.cpp.patch
index 9227b19d..8d677c37 100644
--- a/rd-submodules/es-de/ViewController.cpp.patch
+++ b/rd-submodules/es-de/ViewController.cpp.patch
@@ -1,22 +1,7 @@
 diff -au1r emulationstation-de/es-app/src/views/ViewController.cpp emulationstation-de/es-app/src/views/ViewController.cpp
---- emulationstation-de/es-app/src/views/ViewController.cpp	2023-11-04 17:32:01.356656877 +0100
-+++ emulationstation-de/es-app/src/views/ViewController.cpp	2023-11-04 17:38:58.132211437 +0100
-@@ -180,7 +180,9 @@
- {
--    mNoGamesErrorMessage = "RETRODECK COULD NOT FIND ANY ROM FILES. "
--                           "PLEASE PLACE YOUR ROM FILES INTO THE APPROPRIATE "
--                           "SYSTEM SUBFOLDER IN THE CONFIGURED ROM DIRECTORY "
--                           "AND RUN RETRODECK AGAIN TO SCAN YOUR LIBRARY.\n"
--                           "THE CURRENTLY CONFIGURED ROM DIRECTORY IS:\n";
-+    mNoGamesErrorMessage = "NO GAME FILES WERE FOUND. EITHER PLACE YOUR GAMES IN "
-+                           "THE CURRENTLY CONFIGURED ROM DIRECTORY OR CHANGE "
-+                           "ITS PATH USING THE BUTTON BELOW. OPTIONALLY THE ROM "
-+                           "DIRECTORY STRUCTURE CAN BE GENERATED WHICH WILL "
-+                           "CREATE A TEXT FILE FOR EACH SYSTEM PROVIDING SOME "
-+                           "INFORMATION SUCH AS THE SUPPORTED FILE EXTENSIONS.\n"
-+                           "THIS IS THE CURRENTLY CONFIGURED ROM DIRECTORY:\n";
-
-@@ -193,91 +195,3 @@
+--- emulationstation-de/es-app/src/views/ViewController.cpp	2023-11-04 15:09:24.332178777 -0400
++++ emulationstation-de/es-app/src/views/ViewController.cpp	2023-11-04 15:13:59.015780009 -0400
+@@ -195,91 +195,3 @@
      mNoGamesMessageBox = new GuiMsgBox(
 -        HelpStyle(), mNoGamesErrorMessage + mRomDirectory, "CHANGE ROM DIRECTORY",
 -        [this] {
@@ -109,3 +94,8 @@ diff -au1r emulationstation-de/es-app/src/views/ViewController.cpp emulationstat
 -        "QUIT",
 +        HelpStyle(), mNoGamesErrorMessage + mRomDirectory, "QUIT",
          [] {
+@@ -289,3 +201,3 @@
+         },
+-        nullptr, true, false,
++        "", nullptr, "", nullptr, nullptr, true, true,
+         (mRenderer->getIsVerticalOrientation() ?