Fix duplicate `Form.Dispose` implementation

fixes 6d2d07428
This commit is contained in:
YoshiRulz 2024-11-28 07:52:14 +10:00
parent 6d2d07428e
commit a39689d62d
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
2 changed files with 5 additions and 14 deletions

View File

@ -9,19 +9,6 @@ namespace BizHawk.Client.EmuHawk
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>

View File

@ -1076,7 +1076,11 @@ namespace BizHawk.Client.EmuHawk
protected override void Dispose(bool disposing)
{
if (_isBotting) RestoreConfigFlags(); // disposed while running? least we can do is not clobber config
if (disposing)
{
components?.Dispose();
if (_isBotting) RestoreConfigFlags(); // disposed while running? least we can do is not clobber config
}
base.Dispose(disposing: disposing);
}