From 8ec6c762bd2fc69e820d2d80cd0bb6f1c1bbab13 Mon Sep 17 00:00:00 2001
From: pjgat09 <pjgat09@gmail.com>
Date: Tue, 30 Apr 2013 02:22:56 +0000
Subject: [PATCH] N64: Set a variable to volatile to fix problems with bizhawk
 freezing during frame advance.

---
 BizHawk.Emulation/Consoles/Nintendo/N64/N64.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/BizHawk.Emulation/Consoles/Nintendo/N64/N64.cs b/BizHawk.Emulation/Consoles/Nintendo/N64/N64.cs
index ff5ef90235..52ce9ecdce 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/N64/N64.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/N64/N64.cs
@@ -163,10 +163,10 @@ namespace BizHawk.Emulation.Consoles.Nintendo.N64
 		};
 
 		enum m64p_emu_state
-		{
-		  M64EMU_STOPPED = 1,
-		  M64EMU_RUNNING,
-		  M64EMU_PAUSED
+		{
+		  M64EMU_STOPPED = 1,
+		  M64EMU_RUNNING,
+		  M64EMU_PAUSED
 		};
 
 		//[DllImport(@"..\..\libmupen64plus\mupen64plus-ui-console\projects\msvc11\Release\mupen64plus.dll", CallingConvention = CallingConvention.Cdecl)]
@@ -236,7 +236,7 @@ namespace BizHawk.Emulation.Consoles.Nintendo.N64
 
 		Thread m64pEmulator;
 
-		bool m64pFrameComplete = false;
+		volatile bool m64pFrameComplete = false;
 
 		public N64(CoreComm comm, GameInfo game, byte[] rom)
 		{