From f33ac3cce600ff4d61ecb5730c13954398d2cd27 Mon Sep 17 00:00:00 2001
From: zeromus <zeromus@users.noreply.github.com>
Date: Thu, 27 Aug 2020 15:42:32 -0400
Subject: [PATCH] change how mainform disposes itself. it seems we can be
 disposed from deep inside winforms, likely when the window is closed. changed
 to not accidentally run dispose again

---
 src/BizHawk.Client.EmuHawk/Program.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/BizHawk.Client.EmuHawk/Program.cs b/src/BizHawk.Client.EmuHawk/Program.cs
index 36ba9f474d..3ecd21632d 100644
--- a/src/BizHawk.Client.EmuHawk/Program.cs
+++ b/src/BizHawk.Client.EmuHawk/Program.cs
@@ -212,13 +212,15 @@ namespace BizHawk.Client.EmuHawk
 				}
 				else
 				{
-					using var mf = new MainForm(args);
+					var mf = new MainForm(args);
 					var title = mf.Text;
 					mf.Show();
 					mf.Text = title;
 					try
 					{
 						GlobalWin.ExitCode = mf.ProgramRunLoop();
+						if (!mf.IsDisposed)
+							mf.Dispose();
 					}
 					catch (Exception e) when (GlobalWin.MovieSession.Movie.IsActive() && !(Debugger.IsAttached || VersionInfo.DeveloperBuild))
 					{