reverse mounting order, fix bug storing save/load method

dborth · Feb 2, 2021 · 64d4af1b56ac46c75fc539d42aa70ba396813960 · 64d4af1
1 parent 9aaed4f
commit 64d4af1b56ac46c75fc539d42aa70ba396813960
Showing with 11 additions and 11 deletions.

+4 −4 source/filebrowser.cpp

+2 −2 source/fileop.cpp

+5 −5 source/preferences.cpp
diff --git a/source/filebrowser.cpp b/source/filebrowser.cpp
@@ -63,12 +63,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))
@@ -96,12 +96,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
@@ -206,9 +206,9 @@ void UnmountAllFAT()
 	fatUnmount("sd:");
 	fatUnmount("usb:");
 #else
+	fatUnmount("port2:");
 	fatUnmount("carda:");
 	fatUnmount("cardb:");
-	fatUnmount("port2:");
 #endif
 }
 
@@ -299,9 +299,9 @@ void MountAllFAT()
 	MountFAT(DEVICE_SD, SILENT);
 	MountFAT(DEVICE_USB, SILENT);
 #else
+	MountFAT(DEVICE_SD_PORT2, SILENT);
 	MountFAT(DEVICE_SD_SLOTA, SILENT);
 	MountFAT(DEVICE_SD_SLOTB, SILENT);
-	MountFAT(DEVICE_SD_PORT2, SILENT);
 #endif
 }
 

diff --git a/source/preferences.cpp b/source/preferences.cpp
@@ -367,9 +367,9 @@ decodePrefsData ()
  ***************************************************************************/
 void FixInvalidSettings()
 {
-	if(GCSettings.LoadMethod > 6)
+	if(GCSettings.LoadMethod > 7)
 		GCSettings.LoadMethod = DEVICE_AUTO;
-	if(GCSettings.SaveMethod > 6)
+	if(GCSettings.SaveMethod > 7)
 		GCSettings.SaveMethod = DEVICE_AUTO;
 	if(!(GCSettings.zoomHor > 0.5 && GCSettings.zoomHor < 1.5))
 		GCSettings.zoomHor = 1.0;
@@ -591,9 +591,9 @@ bool LoadPrefs()
 	sprintf(filepath[4], "usb:/%s", APPFOLDER);
 #else
 	numDevices = 3;
-	sprintf(filepath[0], "carda:/%s", APPFOLDER);
-	sprintf(filepath[1], "cardb:/%s", APPFOLDER);
-	sprintf(filepath[2], "port2:/%s", APPFOLDER);
+	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++)