From b291b3e6c54f816cb4a5d8bae1a311097db438c0 Mon Sep 17 00:00:00 2001
From: Daryl Borth <dborth@gmail.com>
Date: Sat, 6 Feb 2021 16:05:55 -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/snes9xgx.h      |  2 +-
 6 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/README.md b/README.md
index 5605ddc..5ced221 100644
--- a/README.md
+++ b/README.md
@@ -39,6 +39,10 @@ Wii homebrew is WiiBrew (www.wiibrew.org).
 
 ## UPDATE HISTORY
 
+[4.5.1 - February 6, 2021]
+
+* Fixed SD2SP2 / SD gecko issues (again)
+
 [4.5.0 - January 31, 2021]
 
 * Fixed SD2SP2 issues
diff --git a/hbc/meta.xml b/hbc/meta.xml
index b22c457..693f4f7 100644
--- a/hbc/meta.xml
+++ b/hbc/meta.xml
@@ -2,8 +2,8 @@
 <app version="1">
   <name>Snes9x GX</name>
   <coder>Tantric, Zopenko, Askot</coder>
-  <version>4.5.0</version>
-  <release_date>20210131</release_date>
+  <version>4.5.1</version>
+  <release_date>20210206</release_date>
   <short_description>Super Nintendo Emulator</short_description> 
   <long_description>A port of Snes9x to the Wii.</long_description> 
   <ahb_access />
diff --git a/source/filebrowser.cpp b/source/filebrowser.cpp
index 555b4b5..6834a43 100644
--- a/source/filebrowser.cpp
+++ b/source/filebrowser.cpp
@@ -68,12 +68,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))
@@ -101,12 +101,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 6717b24..45c91af 100644
--- a/source/fileop.cpp
+++ b/source/fileop.cpp
@@ -294,10 +294,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 eb07203..522930d 100644
--- a/source/preferences.cpp
+++ b/source/preferences.cpp
@@ -662,12 +662,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++)
 	{
@@ -676,6 +670,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/snes9xgx.h b/source/snes9xgx.h
index 423869f..741fe00 100644
--- a/source/snes9xgx.h
+++ b/source/snes9xgx.h
@@ -20,7 +20,7 @@
 #include "filelist.h"
 
 #define APPNAME 			"Snes9x GX"
-#define APPVERSION 			"4.5.0"
+#define APPVERSION 			"4.5.1"
 #define APPFOLDER 			"snes9xgx"
 #define PREF_FILE_NAME		"settings.xml"