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

Only call `SettingsAdapter` ctor via `MainForm.GetSettingsAdapter*`

This commit is contained in:
YoshiRulz 2022-01-10 20:24:21 +10:00 committed by James Groom
parent c1524d8de9
commit 3f090e47a5
5 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/BizHawk.Client.Common/movie/MovieConversionExtensions.cs
View File

@ -180,6 +180,7 @@ namespace BizHawk.Client.Common
public static void PopulateWithDefaultHeaderValues(
this IMovie movie,
IEmulator emulator,
SettingsAdapter settable,
IGameInfo game,
FirmwareManager firmwareManager,
string author)
@ -189,7 +190,6 @@ namespace BizHawk.Client.Common
movie.OriginalEmulatorVersion = VersionInfo.GetEmuVersion();
movie.SystemID = emulator.SystemId;
var settable = new SettingsAdapter(emulator);
if (settable.HasSyncSettings)
{
movie.SyncSettingsJson = ConfigService.SaveWithType(settable.GetSyncSettings());

2
src/BizHawk.Client.EmuHawk/MainForm.cs
View File

@ -3983,7 +3983,7 @@ namespace BizHawk.Client.EmuHawk
{
// save settings object
var t = Emulator.GetType();
var settable = new SettingsAdapter(Emulator);
var settable = GetSettingsAdapterForLoadedCoreUntyped();
if (settable.HasSettings)
{

2
src/BizHawk.Client.EmuHawk/config/ProfileConfig.cs
View File

@ -241,7 +241,7 @@ namespace BizHawk.Client.EmuHawk
where TEmulator : IEmulator
{
object fromCore = null;
var settable = new SettingsAdapter(_emulator);
var settable = ((MainForm) _mainForm).GetSettingsAdapterForLoadedCoreUntyped(); //HACK
if (settable.HasSyncSettings)
{
fromCore = settable.GetSyncSettings();

1
src/BizHawk.Client.EmuHawk/movie/RecordMovie.cs
View File

@ -149,6 +149,7 @@ namespace BizHawk.Client.EmuHawk
movieToRecord.PopulateWithDefaultHeaderValues(
_emulator,
((MainForm) _mainForm).GetSettingsAdapterForLoadedCoreUntyped(), //HACK
_game,
_firmwareManager,
AuthorBox.Text ?? _config.DefaultAuthor);

1
src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
View File

@ -592,6 +592,7 @@ namespace BizHawk.Client.EmuHawk
tasMovie.PopulateWithDefaultHeaderValues(
Emulator,
((MainForm) MainForm).GetSettingsAdapterForLoadedCoreUntyped(), //HACK
Game,
MainForm.FirmwareManager,
Config.DefaultAuthor);