ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add missing disc presence check to `NymaCore.FrameAdvancePrep` 

fixes #4056
`ControllerAdapter` ctor uses `(discs?.Length ?? 0) > 0`, but it gets
`discs` from earlier in core init; when it's later assigned to `_disks`,
empty lists are replaced with null, and other places in `NymaCore` use
`_disks != null`. The `default(int)` is to match pre-3af5b7a7f
behaviour.
This commit is contained in:
YoshiRulz 2024-09-27 05:46:44 +10:00
parent eaef1f3829
commit 4ccf4eafef
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/BizHawk.Emulation.Cores/Waterbox/NymaCore.cs
View File

@ -245,10 +245,13 @@ namespace BizHawk.Emulation.Cores.Waterbox
flags |= LibNymaCore.BizhawkFlags.SkipSoundening;
if (SettingsQuery("nyma.constantfb") != "0")
flags |= LibNymaCore.BizhawkFlags.RenderConstantSize;
if (controller.IsPressed("Open Tray"))
flags |= LibNymaCore.BizhawkFlags.OpenTray;
if (controller.IsPressed("Close Tray"))
flags |= LibNymaCore.BizhawkFlags.CloseTray;
int diskIndex = default;
if (_disks is not null)
{
if (controller.IsPressed("Open Tray")) flags |= LibNymaCore.BizhawkFlags.OpenTray;
if (controller.IsPressed("Close Tray")) flags |= LibNymaCore.BizhawkFlags.CloseTray;
diskIndex = controller.AxisValue("Disk Index");
}
var ret = new LibNymaCore.FrameInfo
{
@ -260,7 +263,7 @@ namespace BizHawk.Emulation.Cores.Waterbox
: LibNymaCore.CommandType.NONE,
InputPortData = (byte*)_frameAdvanceInputLock.AddrOfPinnedObject(),
FrontendTime = GetRtcTime(SettingsQuery("nyma.rtcrealtime") != "0"),
DiskIndex = controller.AxisValue("Disk Index")
DiskIndex = diskIndex,
};
if (_frameThreadStart != null)
{