Better fix: only process if the emulator has initialized

OpenEmu · Nov 1, 2013 · c271c05 · c271c05
1 parent 27ede4a
commit c271c05
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/PPSSPPGameCore.mm b/PPSSPPGameCore.mm
@@ -150,9 +150,6 @@ - (void)executeFrame
 
         host->BootDone();
 		host->UpdateDisassembly();
-
-        // Process save states here for auto-loading
-        SaveState::Process();
     }
 
     NativeRender();
@@ -212,13 +209,14 @@ static void _OESaveStateCallback(bool status, void *cbUserData)
 - (void)saveStateToFileAtPath:(NSString *)fileName completionHandler:(void (^)(BOOL, NSError *))block
 {
     SaveState::Save([fileName UTF8String], _OESaveStateCallback, (__bridge_retained void *)[block copy]);
-    SaveState::Process();
+    if(_isInitialized) SaveState::Process();
 }
 
 
 - (void)loadStateFromFileAtPath:(NSString *)fileName completionHandler:(void (^)(BOOL, NSError *))block
 {
     SaveState::Load([fileName UTF8String], _OESaveStateCallback, (__bridge_retained void *)[block copy]);
+    if(_isInitialized) SaveState::Process();
 }
 
 # pragma mark - Input