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

Merge branch 'nymashock' of https://github.com/CasualPokePlayer/BizHawk into nymashock

This commit is contained in:
CasualPokePlayer 2022-01-26 12:54:16 -08:00
parent 06fd332dac 31f96f1306
commit 3b18788573
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/BizHawk.Emulation.Cores/Waterbox/NymaCore.Settings.cs
View File

@ -275,6 +275,9 @@ namespace BizHawk.Emulation.Cores.Waterbox
foreach (var portInfo in allPorts)
{
if (s.AllOverrides.ContainsKey(portInfo.FullName) && s.AllOverrides[portInfo.FullName].Default != null)
portInfo.DefaultDeviceShortName = s.AllOverrides[portInfo.FullName].Default;
s.Ports.Add(new NymaSettingsInfo.Port
{
Name = portInfo.FullName,
@ -286,8 +289,6 @@ namespace BizHawk.Emulation.Cores.Waterbox
SettingValue = dev.ShortName
}).ToList()
});
if (s.AllOverrides.ContainsKey(portInfo.FullName) && s.AllOverrides[portInfo.FullName].Default != null)
portInfo.DefaultDeviceShortName = s.Ports.Last().DefaultSettingsValue = s.AllOverrides[portInfo.FullName].Default;
}
var originalSettings = GetSettingsData();