[Project64] be able to load/save states when loaded but not running

2016-06-05 10:28:59 +10:00 · 2016-06-05 10:28:59 +10:00 · d4ef667aa7
parent 44b887f465
commit d4ef667aa7
1 changed files with 22 additions and 6 deletions
--- a/Source/Project64-core/N64System/N64Class.cpp
+++ b/Source/Project64-core/N64System/N64Class.cpp
@ -91,6 +91,22 @@ CN64System::~CN64System()

 void CN64System::ExternalEvent(SystemEvent action)
 {
+    if (action == SysEvent_LoadMachineState && 
+        !g_Settings->LoadBool(GameRunning_CPU_Running) &&
+        g_BaseSystem != NULL &&
+        g_BaseSystem->LoadState())
+    {
+        return;
+    }
+
+    if (action == SysEvent_SaveMachineState &&
+        !g_Settings->LoadBool(GameRunning_CPU_Running) &&
+        g_BaseSystem != NULL &&
+        g_BaseSystem->SaveState())
+    {
+        return;
+    }
+
    switch (action)
    {
    case SysEvent_Profile_GenerateLogs: