empathicqubit/Mesen-X
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

FDS: Fixed crash when using "Switch Disk Side" when game has 1 side (~64kb)

Browse source
This commit is contained in:
Sour 2018-06-03 18:20:40 -04:00
parent bb18cf9a3f
commit e68892f62f
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Core/FDS.cpp
View file

@ -532,7 +532,7 @@ void FDS::EjectDisk()
void FDS::InsertDisk(uint32_t diskNumber) void FDS::InsertDisk(uint32_t diskNumber)
{ {
if(_diskNumber == FDS::NoDiskInserted) { if(_diskNumber == FDS::NoDiskInserted) {
_diskNumber = diskNumber; _diskNumber = diskNumber % GetSideCount();
} }
} }

2
Core/FdsSystemActionManager.h
View file

@ -105,7 +105,7 @@ public:
if(!IsAutoInsertDiskEnabled()) { if(!IsAutoInsertDiskEnabled()) {
shared_ptr<FDS> mapper = _mapper.lock(); shared_ptr<FDS> mapper = _mapper.lock();
if(mapper && mapper->IsDiskInserted()) { if(mapper && mapper->IsDiskInserted()) {
InsertDisk(mapper->GetCurrentDisk() ^ 0x01); InsertDisk((mapper->GetCurrentDisk() ^ 0x01) % mapper->GetSideCount());
} }
} }
} }

3
GUI.NET/Forms/frmMain.cs
View file

@ -637,6 +637,7 @@ namespace Mesen.GUI.Forms
Func<bool> runningNotNsf = () => { return _emuThread != null && !InteropEmu.IsNsf(); }; Func<bool> runningNotNsf = () => { return _emuThread != null && !InteropEmu.IsNsf(); };
Func<bool> runningFdsNoAutoInsert = () => { return _emuThread != null && InteropEmu.FdsGetSideCount() > 0 && !InteropEmu.FdsIsAutoInsertDiskEnabled() && !InteropEmu.MoviePlaying() && !InteropEmu.IsConnected(); }; Func<bool> runningFdsNoAutoInsert = () => { return _emuThread != null && InteropEmu.FdsGetSideCount() > 0 && !InteropEmu.FdsIsAutoInsertDiskEnabled() && !InteropEmu.MoviePlaying() && !InteropEmu.IsConnected(); };
Func<bool> runningFdsMultipleDisks = () => { return runningFdsNoAutoInsert() && InteropEmu.FdsGetSideCount() > 1; };
Func<bool> runningVsSystem = () => { return _emuThread != null && InteropEmu.IsVsSystem() && !InteropEmu.MoviePlaying() && !InteropEmu.IsConnected(); }; Func<bool> runningVsSystem = () => { return _emuThread != null && InteropEmu.IsVsSystem() && !InteropEmu.MoviePlaying() && !InteropEmu.IsConnected(); };
Func<bool> hasBarcodeReader = () => { return InteropEmu.GetAvailableFeatures().HasFlag(ConsoleFeatures.BarcodeReader) && !InteropEmu.IsConnected(); }; Func<bool> hasBarcodeReader = () => { return InteropEmu.GetAvailableFeatures().HasFlag(ConsoleFeatures.BarcodeReader) && !InteropEmu.IsConnected(); };
@ -656,7 +657,7 @@ namespace Mesen.GUI.Forms
BindShortcut(mnuPowerCycle, EmulatorShortcut.PowerCycle, runningNotClientNotMovie); BindShortcut(mnuPowerCycle, EmulatorShortcut.PowerCycle, runningNotClientNotMovie);
BindShortcut(mnuPowerOff, EmulatorShortcut.PowerOff, runningNotClient); BindShortcut(mnuPowerOff, EmulatorShortcut.PowerOff, runningNotClient);
BindShortcut(mnuSwitchDiskSide, EmulatorShortcut.SwitchDiskSide, runningFdsNoAutoInsert); BindShortcut(mnuSwitchDiskSide, EmulatorShortcut.SwitchDiskSide, runningFdsMultipleDisks);
BindShortcut(mnuEjectDisk, EmulatorShortcut.EjectDisk, runningFdsNoAutoInsert); BindShortcut(mnuEjectDisk, EmulatorShortcut.EjectDisk, runningFdsNoAutoInsert);
BindShortcut(mnuInsertCoin1, EmulatorShortcut.InsertCoin1, runningVsSystem); BindShortcut(mnuInsertCoin1, EmulatorShortcut.InsertCoin1, runningVsSystem);