From ec1c27596bcd4c1a6e9c9f89023ff0f55585bdb3 Mon Sep 17 00:00:00 2001 From: Morilli <35152647+Morilli@users.noreply.github.com> Date: Mon, 17 Jun 2024 00:46:32 +0200 Subject: [PATCH] Reduce unnecessary action duplications in MultiDiskBundler --- .../tools/MultiDiskBundler/MultiDiskBundler.Designer.cs | 1 - .../tools/MultiDiskBundler/MultiDiskBundler.cs | 3 --- .../tools/MultiDiskBundler/MultiDiskFileSelector.cs | 6 ------ 3 files changed, 10 deletions(-) diff --git a/src/BizHawk.Client.EmuHawk/tools/MultiDiskBundler/MultiDiskBundler.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/MultiDiskBundler/MultiDiskBundler.Designer.cs index 657b81adf1..76e2916f13 100644 --- a/src/BizHawk.Client.EmuHawk/tools/MultiDiskBundler/MultiDiskBundler.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/MultiDiskBundler/MultiDiskBundler.Designer.cs @@ -191,7 +191,6 @@ this.MainMenuStrip = this.MultiDiskMenuStrip; this.Name = "MultiDiskBundler"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; - this.Load += new System.EventHandler(this.MultiGameCreator_Load); this.grpName.ResumeLayout(false); this.grpName.PerformLayout(); this.ResumeLayout(false); diff --git a/src/BizHawk.Client.EmuHawk/tools/MultiDiskBundler/MultiDiskBundler.cs b/src/BizHawk.Client.EmuHawk/tools/MultiDiskBundler/MultiDiskBundler.cs index 40fe23c00d..b39fdf1f09 100644 --- a/src/BizHawk.Client.EmuHawk/tools/MultiDiskBundler/MultiDiskBundler.cs +++ b/src/BizHawk.Client.EmuHawk/tools/MultiDiskBundler/MultiDiskBundler.cs @@ -53,8 +53,6 @@ namespace BizHawk.Client.EmuHawk }); } - private void MultiGameCreator_Load(object sender, EventArgs e) => Restart(); - public override void Restart() { FileSelectorPanel.Controls.Clear(); @@ -87,7 +85,6 @@ namespace BizHawk.Client.EmuHawk } FileSelectors.First().Path = MainForm.CurrentlyOpenRom; - Recalculate(); } } diff --git a/src/BizHawk.Client.EmuHawk/tools/MultiDiskBundler/MultiDiskFileSelector.cs b/src/BizHawk.Client.EmuHawk/tools/MultiDiskBundler/MultiDiskFileSelector.cs index 93fd91cc6d..6cc2ec2881 100644 --- a/src/BizHawk.Client.EmuHawk/tools/MultiDiskBundler/MultiDiskFileSelector.cs +++ b/src/BizHawk.Client.EmuHawk/tools/MultiDiskBundler/MultiDiskFileSelector.cs @@ -27,11 +27,6 @@ namespace BizHawk.Client.EmuHawk public event EventHandler NameChanged; - private void HandleLabelTextChanged(object sender, EventArgs e) - { - OnNameChanged(EventArgs.Empty); - } - public MultiDiskFileSelector(IDialogController dialogController, PathEntryCollection pathEntries, Func getLoadedRomNameCallback, Func getSystemNameCallback) { @@ -40,7 +35,6 @@ namespace BizHawk.Client.EmuHawk _getLoadedRomNameCallback = getLoadedRomNameCallback; _getSystemNameCallback = getSystemNameCallback; InitializeComponent(); - PathBox.TextChanged += HandleLabelTextChanged; } protected virtual void OnNameChanged(EventArgs e)