diff --git a/source/filebrowser.cpp b/source/filebrowser.cpp index 6834a43..555b4b5 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 c2f9a02..6717b24 100644 --- a/source/fileop.cpp +++ b/source/fileop.cpp @@ -204,9 +204,9 @@ void UnmountAllFAT() fatUnmount("sd:"); fatUnmount("usb:"); #else + fatUnmount("port2:"); fatUnmount("carda:"); fatUnmount("cardb:"); - fatUnmount("port2:"); #endif } @@ -295,9 +295,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 index e5b18a6..eb07203 100644 --- a/source/preferences.cpp +++ b/source/preferences.cpp @@ -387,9 +387,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; @@ -664,9 +664,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