reverse mounting order, fix bug storing save/load method

This commit is contained in:
Daryl Borth 2021-02-02 16:06:39 -07:00
parent bf65ffe432
commit 615a358996
3 changed files with 11 additions and 11 deletions

View File

@ -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)

View File

@ -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
}

View File

@ -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<numDevices; i++)