From 64f0681fcde2f9fa7deb44531b50dead1e30cf7e Mon Sep 17 00:00:00 2001
From: zeromus <zeromus@zeromus.org>
Date: Sun, 20 Feb 2011 18:28:01 +0000
Subject: [PATCH] dont crash on exit

---
 BizHawk.MultiClient/MainForm.cs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs
index 44639bfeb6..8c380da97c 100644
--- a/BizHawk.MultiClient/MainForm.cs
+++ b/BizHawk.MultiClient/MainForm.cs
@@ -29,6 +29,7 @@ namespace BizHawk.MultiClient
 			public int FrameAdvanceDelay;
 			public bool runloop_frameProgress;
 			public bool skipnextframe;
+			public bool exit;
 		}
 		MainLoopData mainLoopData = new MainLoopData();
 		public bool EmulatorPaused;
@@ -144,6 +145,12 @@ namespace BizHawk.MultiClient
 			throttle = new Throttle(30);
 		}
 
+		protected override void OnClosed(EventArgs e)
+		{
+			mainLoopData.exit = true;
+			base.OnClosed(e);
+		}
+
 		public void ProgramRunLoop()
 		{
 			for (; ; )
@@ -158,6 +165,8 @@ namespace BizHawk.MultiClient
 				Render();
 
 				CheckMessages();
+				if (mainLoopData.exit)
+					break;
 				Thread.Sleep(0);
 			}
 		}