ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #625 from LuigiBlood/64dd 

Potential Windows 10 BSOD FIX
This commit is contained in:
zilmar 2015-09-24 09:29:43 +10:00
parent e6dd517b35 19a6beab80
commit e8f3c969fe
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Project64/N64 System/N64 Class.cpp
View File

@ -208,6 +208,9 @@ bool CN64System::RunFileImage ( const char * FileLoc )
g_Notify->AddRecentRom(FileLoc); g_Notify->AddRecentRom(FileLoc);
g_Notify->SetWindowCaption(g_Settings->LoadString(Game_GoodName).ToUTF16().c_str()); 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) if (g_Settings->LoadDword(Setting_AutoStart) != 0)
{ {
g_BaseSystem = new CN64System(g_Plugins,false); g_BaseSystem = new CN64System(g_Plugins,false);
@ -216,8 +219,6 @@ bool CN64System::RunFileImage ( const char * FileLoc )
g_BaseSystem->StartEmulation(true); g_BaseSystem->StartEmulation(true);
} }
} }
g_Settings->SaveBool(GameRunning_LoadingInProgress,false);
g_Notify->RefreshMenu();
} }
else else
{ {