The-Homebrew-Cloud/snes9xgx
2
0
Fork 0
mirror of https://github.com/dborth/snes9xgx.git synced 2024-12-27 03:31:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

reverse mounting order, fix bug storing save/load method

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/filebrowser.cpp
View File

@ -68,12 +68,12 @@ int autoLoadMethod()
device = DEVICE_SD; device = DEVICE_SD;
else if(ChangeInterface(DEVICE_USB, SILENT)) else if(ChangeInterface(DEVICE_USB, SILENT))
device = DEVICE_USB; device = DEVICE_USB;
else if(ChangeInterface(DEVICE_SD_PORT2, SILENT))
device = DEVICE_SD_PORT2;
else if(ChangeInterface(DEVICE_SD_SLOTA, SILENT)) else if(ChangeInterface(DEVICE_SD_SLOTA, SILENT))
device = DEVICE_SD_SLOTA; device = DEVICE_SD_SLOTA;
else if(ChangeInterface(DEVICE_SD_SLOTB, SILENT)) else if(ChangeInterface(DEVICE_SD_SLOTB, SILENT))
device = DEVICE_SD_SLOTB; device = DEVICE_SD_SLOTB;
else if(ChangeInterface(DEVICE_SD_PORT2, SILENT))
device = DEVICE_SD_PORT2;
else if(ChangeInterface(DEVICE_DVD, SILENT)) else if(ChangeInterface(DEVICE_DVD, SILENT))
device = DEVICE_DVD; device = DEVICE_DVD;
else if(ChangeInterface(DEVICE_SMB, SILENT)) else if(ChangeInterface(DEVICE_SMB, SILENT))
@ -101,12 +101,12 @@ int autoSaveMethod(bool silent)
device = DEVICE_SD; device = DEVICE_SD;
else if(ChangeInterface(DEVICE_USB, SILENT)) else if(ChangeInterface(DEVICE_USB, SILENT))
device = DEVICE_USB; device = DEVICE_USB;
else if(ChangeInterface(DEVICE_SD_PORT2, SILENT))
device = DEVICE_SD_PORT2;
else if(ChangeInterface(DEVICE_SD_SLOTA, SILENT)) else if(ChangeInterface(DEVICE_SD_SLOTA, SILENT))
device = DEVICE_SD_SLOTA; device = DEVICE_SD_SLOTA;
else if(ChangeInterface(DEVICE_SD_SLOTB, SILENT)) else if(ChangeInterface(DEVICE_SD_SLOTB, SILENT))
device = DEVICE_SD_SLOTB; device = DEVICE_SD_SLOTB;
else if(ChangeInterface(DEVICE_SD_PORT2, SILENT))
device = DEVICE_SD_PORT2;
else if(ChangeInterface(DEVICE_SMB, SILENT)) else if(ChangeInterface(DEVICE_SMB, SILENT))
device = DEVICE_SMB; device = DEVICE_SMB;
else if(!silent) else if(!silent)

4
source/fileop.cpp
View File

@ -204,9 +204,9 @@ void UnmountAllFAT()
fatUnmount("sd:"); fatUnmount("sd:");
fatUnmount("usb:"); fatUnmount("usb:");
#else #else
fatUnmount("port2:");
fatUnmount("carda:"); fatUnmount("carda:");
fatUnmount("cardb:"); fatUnmount("cardb:");
fatUnmount("port2:");
#endif #endif
} }
@ -295,9 +295,9 @@ void MountAllFAT()
MountFAT(DEVICE_SD, SILENT); MountFAT(DEVICE_SD, SILENT);
MountFAT(DEVICE_USB, SILENT); MountFAT(DEVICE_USB, SILENT);
#else #else
MountFAT(DEVICE_SD_PORT2, SILENT);
MountFAT(DEVICE_SD_SLOTA, SILENT); MountFAT(DEVICE_SD_SLOTA, SILENT);
MountFAT(DEVICE_SD_SLOTB, SILENT); MountFAT(DEVICE_SD_SLOTB, SILENT);
MountFAT(DEVICE_SD_PORT2, SILENT);
#endif #endif
} }

10
source/preferences.cpp
View File

@ -387,9 +387,9 @@ decodePrefsData ()
***************************************************************************/ ***************************************************************************/
void FixInvalidSettings() void FixInvalidSettings()
{ {
if(GCSettings.LoadMethod > 6) if(GCSettings.LoadMethod > 7)
GCSettings.LoadMethod = DEVICE_AUTO; GCSettings.LoadMethod = DEVICE_AUTO;
if(GCSettings.SaveMethod > 6) if(GCSettings.SaveMethod > 7)
GCSettings.SaveMethod = DEVICE_AUTO; GCSettings.SaveMethod = DEVICE_AUTO;
if(!(GCSettings.zoomHor > 0.5 && GCSettings.zoomHor < 1.5)) if(!(GCSettings.zoomHor > 0.5 && GCSettings.zoomHor < 1.5))
GCSettings.zoomHor = 1.0; GCSettings.zoomHor = 1.0;
@ -664,9 +664,9 @@ bool LoadPrefs()
sprintf(filepath[4], "usb:/%s", APPFOLDER); sprintf(filepath[4], "usb:/%s", APPFOLDER);
#else #else
numDevices = 3; numDevices = 3;
sprintf(filepath[0], "carda:/%s", APPFOLDER); sprintf(filepath[0], "port2:/%s", APPFOLDER);
sprintf(filepath[1], "cardb:/%s", APPFOLDER); sprintf(filepath[1], "carda:/%s", APPFOLDER);
sprintf(filepath[2], "port2:/%s", APPFOLDER); sprintf(filepath[2], "cardb:/%s", APPFOLDER);
#endif #endif
for(int i=0; i<numDevices; i++) for(int i=0; i<numDevices; i++)