From a87f08379cd821ba89311fc10c12d0191afb80af Mon Sep 17 00:00:00 2001 From: adelikat Date: Fri, 27 Nov 2020 10:33:42 -0600 Subject: [PATCH] GB ColorChooserForm - simplify code, remove a GlobalWin usage for free --- .../config/GB/ColorChooserForm.cs | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/src/BizHawk.Client.EmuHawk/config/GB/ColorChooserForm.cs b/src/BizHawk.Client.EmuHawk/config/GB/ColorChooserForm.cs index 5353da061d..6f91b8b228 100644 --- a/src/BizHawk.Client.EmuHawk/config/GB/ColorChooserForm.cs +++ b/src/BizHawk.Client.EmuHawk/config/GB/ColorChooserForm.cs @@ -230,19 +230,14 @@ namespace BizHawk.Client.EmuHawk RefreshAllBackdrops(); } - private static void DoColorChooserFormDialog(IWin32Window parent, Gameboy.GambatteSettings s, bool fromMenu) + public static void DoColorChooserFormDialog(IWin32Window parent, Gameboy.GambatteSettings s) { using var dlg = new ColorChooserForm(); - var gb = GlobalWin.Emulator as Gameboy; - if (fromMenu) - { - s = gb.GetSettings(); - } dlg.SetAllColors(s.GBPalette); var result = dlg.ShowDialog(parent); - if (result == DialogResult.OK) + if (result.IsOk()) { int[] colors = new int[12]; for (int i = 0; i < 12; i++) @@ -251,18 +246,9 @@ namespace BizHawk.Client.EmuHawk } s.GBPalette = colors; - if (fromMenu) - { - gb.PutSettings(s); - } } } - public static void DoColorChooserFormDialog(IWin32Window parent, Gameboy.GambatteSettings s) - { - DoColorChooserFormDialog(parent, s, false); - } - private void LoadColorFile(string filename, bool alert) { try