From ead882daf1de9162809b2aa912ac70b697ed0a25 Mon Sep 17 00:00:00 2001
From: Daryl Borth <dborth@gmail.com>
Date: Sat, 6 Feb 2021 16:06:33 -0700
Subject: [PATCH] Fixed SD2SP2 / SD gecko issues

---
 README.md              |  4 ++++
 hbc/meta.xml           |  4 ++--
 source/filebrowser.cpp |  8 ++++----
 source/fileop.cpp      |  4 ----
 source/preferences.cpp | 20 ++++++++++++++------
 source/vbagx.h         |  2 +-
 6 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/README.md b/README.md
index b0990e4..3ae13c2 100644
--- a/README.md
+++ b/README.md
@@ -38,6 +38,10 @@ With it you can play GBA/Game Boy Color/Game Boy games on your Wii/GameCube.
 
 ## UPDATE HISTORY
 
+[2.4.4 - February 6, 2021]
+
+* Fixed SD2SP2 / SD gecko issues (again)
+
 [2.4.3 - January 31, 2021]
 
 * Fixed SD2SP2 issues
diff --git a/hbc/meta.xml b/hbc/meta.xml
index faa8280..8bc9724 100644
--- a/hbc/meta.xml
+++ b/hbc/meta.xml
@@ -2,8 +2,8 @@
 <app version="1">
   <name>Visual Boy Advance GX</name>
   <coder>Tantric</coder>
-  <version>2.4.3</version>
-  <release_date>20210131</release_date>
+  <version>2.4.4</version>
+  <release_date>20210206</release_date>
   <short_description>GBA/GBC/GB Emulator</short_description>
   <long_description>A port of Visual Boy Advance - M to the Wii.</long_description>
   <ahb_access />
diff --git a/source/filebrowser.cpp b/source/filebrowser.cpp
index 2449a47..d6532e9 100644
--- a/source/filebrowser.cpp
+++ b/source/filebrowser.cpp
@@ -62,12 +62,12 @@ int autoLoadMethod()
 		device = DEVICE_SD;
 	else if(ChangeInterface(DEVICE_USB, SILENT))
 		device = DEVICE_USB;
-	else if(ChangeInterface(DEVICE_SD_PORT2, SILENT))
-		device = DEVICE_SD_PORT2;
 	else if(ChangeInterface(DEVICE_SD_SLOTA, SILENT))
 		device = DEVICE_SD_SLOTA;
 	else if(ChangeInterface(DEVICE_SD_SLOTB, SILENT))
 		device = DEVICE_SD_SLOTB;
+	else if(ChangeInterface(DEVICE_SD_PORT2, SILENT))
+		device = DEVICE_SD_PORT2;
 	else if(ChangeInterface(DEVICE_DVD, SILENT))
 		device = DEVICE_DVD;
 	else if(ChangeInterface(DEVICE_SMB, SILENT))
@@ -95,12 +95,12 @@ int autoSaveMethod(bool silent)
 		device = DEVICE_SD;
 	else if(ChangeInterface(DEVICE_USB, SILENT))
 		device = DEVICE_USB;
-	else if(ChangeInterface(DEVICE_SD_PORT2, SILENT))
-		device = DEVICE_SD_PORT2;
 	else if(ChangeInterface(DEVICE_SD_SLOTA, SILENT))
 		device = DEVICE_SD_SLOTA;
 	else if(ChangeInterface(DEVICE_SD_SLOTB, SILENT))
 		device = DEVICE_SD_SLOTB;
+	else if(ChangeInterface(DEVICE_SD_PORT2, SILENT))
+		device = DEVICE_SD_PORT2;
 	else if(ChangeInterface(DEVICE_SMB, SILENT))
 		device = DEVICE_SMB;
 	else if(!silent)
diff --git a/source/fileop.cpp b/source/fileop.cpp
index 755cfcb..5b7efe8 100644
--- a/source/fileop.cpp
+++ b/source/fileop.cpp
@@ -295,10 +295,6 @@ void MountAllFAT()
 #ifdef HW_RVL
 	MountFAT(DEVICE_SD, SILENT);
 	MountFAT(DEVICE_USB, SILENT);
-#else
-	MountFAT(DEVICE_SD_PORT2, SILENT);
-	MountFAT(DEVICE_SD_SLOTA, SILENT);
-	MountFAT(DEVICE_SD_SLOTB, SILENT);
 #endif
 }
 
diff --git a/source/preferences.cpp b/source/preferences.cpp
index b678b06..410607a 100644
--- a/source/preferences.cpp
+++ b/source/preferences.cpp
@@ -815,12 +815,6 @@ bool LoadPrefs()
 	sprintf(filepath[2], "usb:/apps/%s", APPFOLDER);
 	sprintf(filepath[3], "sd:/%s", APPFOLDER);
 	sprintf(filepath[4], "usb:/%s", APPFOLDER);
-#else
-	numDevices = 3;
-	sprintf(filepath[0], "port2:/%s", APPFOLDER);
-	sprintf(filepath[1], "carda:/%s", APPFOLDER);
-	sprintf(filepath[2], "cardb:/%s", APPFOLDER);
-#endif
 
 	for(int i=0; i<numDevices; i++)
 	{
@@ -829,6 +823,20 @@ bool LoadPrefs()
 		if(prefFound)
 			break;
 	}
+#else
+	if(ChangeInterface(DEVICE_SD_SLOTA, SILENT)) {
+		sprintf(filepath[0], "carda:/%s", APPFOLDER);
+		prefFound = LoadPrefsFromMethod(filepath[0]);
+	}
+	else if(ChangeInterface(DEVICE_SD_SLOTB, SILENT)) {
+		sprintf(filepath[0], "cardb:/%s", APPFOLDER);
+		prefFound = LoadPrefsFromMethod(filepath[0]);
+	}
+	else if(ChangeInterface(DEVICE_SD_PORT2, SILENT)) {
+		sprintf(filepath[0], "port2:/%s", APPFOLDER);
+		prefFound = LoadPrefsFromMethod(filepath[0]);
+	}
+#endif
 
 	prefLoaded = true; // attempted to load preferences
 
diff --git a/source/vbagx.h b/source/vbagx.h
index 162d28a..353f01c 100644
--- a/source/vbagx.h
+++ b/source/vbagx.h
@@ -17,7 +17,7 @@
 #include "utils/FreeTypeGX.h"
 
 #define APPNAME 		"Visual Boy Advance GX"
-#define APPVERSION 		"2.4.3"
+#define APPVERSION 		"2.4.4"
 #define APPFOLDER 		"vbagx"
 #define PREF_FILE_NAME 	"settings.xml"
 #define PAL_FILE_NAME 	"palettes.xml"