From b304cc0ef6544923c4a79eafc807c1b1493624ed Mon Sep 17 00:00:00 2001
From: Leon Styhre <leon@leonstyhre.com>
Date: Fri, 30 Jun 2023 18:41:30 +0200
Subject: [PATCH] (Windows) Added pcsx2-qt.exe as the primary executable name
 for the PCSX2 emulator

---
 es-app/assets/Windows_Portable_README.txt            | 3 +--
 resources/systems/windows/es_find_rules.xml          | 7 ++++---
 resources/systems/windows/es_find_rules_portable.xml | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/es-app/assets/Windows_Portable_README.txt b/es-app/assets/Windows_Portable_README.txt
index 788fcf1ec..4434a426b 100644
--- a/es-app/assets/Windows_Portable_README.txt
+++ b/es-app/assets/Windows_Portable_README.txt
@@ -66,8 +66,7 @@ Emulators\mupen64plus\mupen64plus-ui-console.exe
 Emulators\openMSX\openmsx.exe
 Emulators\Oricutron\oricutron.exe
 Emulators\PCSX2\pcsx2.exe
-Emulators\PCSX2-Qt\pcsx2-qtx64.exe
-Emulators\PCSX2-Qt\pcsx2-qtx64-avx2.exe
+Emulators\PCSX2-Qt\pcsx2-qt.exe
 Emulators\PICO-8\pico8.exe
 Emulators\Play\Play.exe
 Emulators\PPSSPP\PPSSPPWindows64.exe
diff --git a/resources/systems/windows/es_find_rules.xml b/resources/systems/windows/es_find_rules.xml
index ae4e8e99c..66deb6811 100644
--- a/resources/systems/windows/es_find_rules.xml
+++ b/resources/systems/windows/es_find_rules.xml
@@ -456,13 +456,14 @@
     <emulator name="PCSX2">
         <!-- Sony PlayStation 2 emulator PCSX2 -->
         <rule type="systempath">
+            <entry>pcsx2-qt.exe</entry>
             <entry>pcsx2-qtx64.exe</entry>
             <entry>pcsx2-qtx64-avx2.exe</entry>
         </rule>
         <rule type="staticpath">
-            <entry>%ESPATH%\Emulators\PCSX2-Qt\pcsx2-qtx64*.exe</entry>
-            <entry>%ESPATH%\PCSX2-Qt\pcsx2-qtx64*.exe</entry>
-            <entry>%ESPATH%\..\PCSX2-Qt\pcsx2-qtx64*.exe</entry>
+            <entry>%ESPATH%\Emulators\PCSX2-Qt\pcsx2-qt*.exe</entry>
+            <entry>%ESPATH%\PCSX2-Qt\pcsx2-qt*.exe</entry>
+            <entry>%ESPATH%\..\PCSX2-Qt\pcsx2-qt*.exe</entry>
         </rule>
     </emulator>
     <emulator name="PCSX2-LEGACY">
diff --git a/resources/systems/windows/es_find_rules_portable.xml b/resources/systems/windows/es_find_rules_portable.xml
index 4c1fd9acf..b6b8dcafd 100644
--- a/resources/systems/windows/es_find_rules_portable.xml
+++ b/resources/systems/windows/es_find_rules_portable.xml
@@ -318,9 +318,9 @@
     <emulator name="PCSX2">
         <!-- Sony PlayStation 2 emulator PCSX2 -->
         <rule type="staticpath">
-            <entry>%ESPATH%\Emulators\PCSX2-Qt\pcsx2-qtx64*.exe</entry>
-            <entry>%ESPATH%\PCSX2-Qt\pcsx2-qtx64*.exe</entry>
-            <entry>%ESPATH%\..\PCSX2-Qt\pcsx2-qtx64*.exe</entry>
+            <entry>%ESPATH%\Emulators\PCSX2-Qt\pcsx2-qt*.exe</entry>
+            <entry>%ESPATH%\PCSX2-Qt\pcsx2-qt*.exe</entry>
+            <entry>%ESPATH%\..\PCSX2-Qt\pcsx2-qt*.exe</entry>
         </rule>
     </emulator>
     <emulator name="PCSX2-LEGACY">