From 19a6beab80a45830045a0f918f13af9e92218e3d Mon Sep 17 00:00:00 2001
From: luigiblood <luigiblood@gmail.com>
Date: Wed, 23 Sep 2015 17:45:39 +0200
Subject: [PATCH] Potential Windows 10 BSOD FIX

---
 Source/Project64/N64 System/N64 Class.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Source/Project64/N64 System/N64 Class.cpp b/Source/Project64/N64 System/N64 Class.cpp
index f2bdd8c0b..896cf728f 100644
--- a/Source/Project64/N64 System/N64 Class.cpp	
+++ b/Source/Project64/N64 System/N64 Class.cpp	
@@ -208,6 +208,9 @@ bool CN64System::RunFileImage ( const char * FileLoc )
 		g_Notify->AddRecentRom(FileLoc);
         g_Notify->SetWindowCaption(g_Settings->LoadString(Game_GoodName).ToUTF16().c_str());
 
+		g_Settings->SaveBool(GameRunning_LoadingInProgress, false);
+		g_Notify->RefreshMenu();
+
 		if (g_Settings->LoadDword(Setting_AutoStart) != 0)
 		{
 			g_BaseSystem = new CN64System(g_Plugins,false);
@@ -216,8 +219,6 @@ bool CN64System::RunFileImage ( const char * FileLoc )
 				g_BaseSystem->StartEmulation(true);
 			}
 		}
-		g_Settings->SaveBool(GameRunning_LoadingInProgress,false);
-		g_Notify->RefreshMenu();
 	}
 	else
 	{