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

Profile config - fix getting of sync settings from non-instantiated cores

This commit is contained in:
adelikat 2014-07-14 11:48:28 +00:00
parent a664591218
commit f5209ccfa2
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
BizHawk.Client.EmuHawk/config/ProfileConfig.cs
View File

@ -274,7 +274,8 @@ namespace BizHawk.Client.EmuHawk
}
else
{
return (N64SyncSettings)Global.Config.GetCoreSyncSettings<N64>();
return (N64SyncSettings)Global.Config.GetCoreSyncSettings<N64>()
?? new N64SyncSettings();
}
}
@ -298,7 +299,8 @@ namespace BizHawk.Client.EmuHawk
}
else
{
return (LibsnesCore.SnesSyncSettings)Global.Config.GetCoreSyncSettings<LibsnesCore>();
return (LibsnesCore.SnesSyncSettings)Global.Config.GetCoreSyncSettings<LibsnesCore>()
?? new LibsnesCore.SnesSyncSettings() ;
}
}
@ -322,7 +324,8 @@ namespace BizHawk.Client.EmuHawk
}
else
{
return (Yabause.SaturnSyncSettings)Global.Config.GetCoreSyncSettings<Yabause>();
return (Yabause.SaturnSyncSettings)Global.Config.GetCoreSyncSettings<Yabause>()
?? new Yabause.SaturnSyncSettings();
}
}
@ -346,7 +349,8 @@ namespace BizHawk.Client.EmuHawk
}
else
{
return (GPGX.GPGXSyncSettings)Global.Config.GetCoreSyncSettings<GPGX>();
return (GPGX.GPGXSyncSettings)Global.Config.GetCoreSyncSettings<GPGX>()
?? new GPGX.GPGXSyncSettings();
}
}
@ -370,7 +374,8 @@ namespace BizHawk.Client.EmuHawk
}
else
{
return (SMS.SMSSyncSettings)Global.Config.GetCoreSyncSettings<SMS>();
return (SMS.SMSSyncSettings)Global.Config.GetCoreSyncSettings<SMS>()
?? new SMS.SMSSyncSettings();
}
}
@ -394,7 +399,8 @@ namespace BizHawk.Client.EmuHawk
}
else
{
return (ColecoVision.ColecoSyncSettings)Global.Config.GetCoreSyncSettings<ColecoVision>();
return (ColecoVision.ColecoSyncSettings)Global.Config.GetCoreSyncSettings<ColecoVision>()
?? new ColecoVision.ColecoSyncSettings();
}
}
@ -409,6 +415,7 @@ namespace BizHawk.Client.EmuHawk
Global.Config.PutCoreSyncSettings<ColecoVision>(s);
}
}
private static Atari2600.A2600SyncSettings GetA2600SyncSettings()
{
if (Global.Emulator is Atari2600)
@ -417,7 +424,8 @@ namespace BizHawk.Client.EmuHawk
}
else
{
return (Atari2600.A2600SyncSettings)Global.Config.GetCoreSyncSettings<Atari2600>();
return (Atari2600.A2600SyncSettings)Global.Config.GetCoreSyncSettings<Atari2600>()
?? new Atari2600.A2600SyncSettings();
}
}

2
BizHawk.Emulation.Cores/Consoles/Sega/Saturn/Yabause.cs
View File

@ -707,7 +707,7 @@ namespace BizHawk.Emulation.Cores.Sega.Saturn
#endregion
SaturnSyncSettings SyncSettings;
public SaturnSyncSettings SyncSettings;
public object GetSettings() { return null; }
public object GetSyncSettings() { return SyncSettings.Clone(); }