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

Don't expose `MainForm.Emulator` via `IMainFormForConfig`

This commit is contained in:
YoshiRulz 2022-05-27 00:45:32 +10:00 committed by James Groom
parent 2cd6510784
commit c1524d8de9
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/BizHawk.Client.EmuHawk/IMainFormForConfig.cs
View File

@ -7,9 +7,6 @@ namespace BizHawk.Client.EmuHawk
{ {
public interface IMainFormForConfig : IDialogParent public interface IMainFormForConfig : IDialogParent
{ {
/// <remarks>only referenced from <see cref="GenericCoreConfig"/></remarks>
IEmulator Emulator { get; }
/// <exception cref="InvalidOperationException">loaded emulator is not instance of <typeparamref name="T"/></exception> /// <exception cref="InvalidOperationException">loaded emulator is not instance of <typeparamref name="T"/></exception>
SettingsAdapter GetSettingsAdapterForLoadedCore<T>() SettingsAdapter GetSettingsAdapterForLoadedCore<T>()
where T : IEmulator; where T : IEmulator;

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

@ -1844,7 +1844,7 @@ namespace BizHawk.Client.EmuHawk
} }
private DialogResult OpenGenericCoreConfig(string title) private DialogResult OpenGenericCoreConfig(string title)
=> GenericCoreConfig.DoDialog(this, title, isMovieActive: MovieSession.Movie.IsActive()); => GenericCoreConfig.DoDialog(Emulator, this, title, isMovieActive: MovieSession.Movie.IsActive());
private void GenericCoreSettingsMenuItem_Click(object sender, EventArgs e) private void GenericCoreSettingsMenuItem_Click(object sender, EventArgs e)
{ {

6
src/BizHawk.Client.EmuHawk/config/GenericCoreConfig.cs
View File

@ -73,9 +73,9 @@ namespace BizHawk.Client.EmuHawk
Close(); Close();
} }
public static DialogResult DoDialog(IMainFormForConfig owner, string title, bool isMovieActive) public static DialogResult DoDialog(IEmulator emulator, IMainFormForConfig owner, string title, bool isMovieActive)
{ {
if (owner.Emulator is Emulation.Cores.Waterbox.NymaCore core) if (emulator is Emulation.Cores.Waterbox.NymaCore core)
{ {
var desc = new Emulation.Cores.Waterbox.NymaTypeDescriptorProvider(core.SettingsInfo); var desc = new Emulation.Cores.Waterbox.NymaTypeDescriptorProvider(core.SettingsInfo);
try try
@ -91,7 +91,7 @@ namespace BizHawk.Client.EmuHawk
TypeDescriptor.RemoveProvider(desc, typeof(Emulation.Cores.Waterbox.NymaCore.NymaSyncSettings)); TypeDescriptor.RemoveProvider(desc, typeof(Emulation.Cores.Waterbox.NymaCore.NymaSyncSettings));
} }
} }
else if(owner.Emulator is Emulation.Cores.Arcades.MAME.MAME mame) else if (emulator is Emulation.Cores.Arcades.MAME.MAME mame)
{ {
var desc = new Emulation.Cores.Arcades.MAME.MAMETypeDescriptorProvider(mame.CurrentDriverSettings); var desc = new Emulation.Cores.Arcades.MAME.MAMETypeDescriptorProvider(mame.CurrentDriverSettings);
try try