From 8aa3dcf72f5617b8c307e05d816b293e7abb9c46 Mon Sep 17 00:00:00 2001 From: YoshiRulz Date: Fri, 18 Sep 2020 06:52:23 +1000 Subject: [PATCH] Remove ToolFormBase.Config and use base property The non-weird init in ToolManager can't pass in the ctor because 1. Config is written to in Restart as well as Load and 2. it's a base class and that's not how ctors work and I should know this --- src/BizHawk.Client.EmuHawk/FormBase.cs | 2 +- src/BizHawk.Client.EmuHawk/tools/ToolFormBase.cs | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/BizHawk.Client.EmuHawk/FormBase.cs b/src/BizHawk.Client.EmuHawk/FormBase.cs index 20fbffeb7d..ef0077199f 100644 --- a/src/BizHawk.Client.EmuHawk/FormBase.cs +++ b/src/BizHawk.Client.EmuHawk/FormBase.cs @@ -12,7 +12,7 @@ namespace BizHawk.Client.EmuHawk { private string? _windowTitleStatic; - public Config? Config { get; protected set; } + public Config? Config { get; set; } [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] public override string Text diff --git a/src/BizHawk.Client.EmuHawk/tools/ToolFormBase.cs b/src/BizHawk.Client.EmuHawk/tools/ToolFormBase.cs index f30f730616..59aa5a55b6 100644 --- a/src/BizHawk.Client.EmuHawk/tools/ToolFormBase.cs +++ b/src/BizHawk.Client.EmuHawk/tools/ToolFormBase.cs @@ -13,12 +13,6 @@ namespace BizHawk.Client.EmuHawk { public ToolManager Tools { get; set; } - public new Config Config - { - get => base.Config; - set => base.Config = value; //TODO used once in ToolManager (for init) and twice in dumb ways - } - public InputManager InputManager { get; set; } public IMainFormForTools MainForm { get; set; }