OpenEmu/PCSX2-Core
1
0
Fork 0
mirror of https://github.com/OpenEmu/PCSX2-Core.git synced 2025-11-01 11:07:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixup Wait code for Race condition on load state

Browse Source
This commit is contained in:
Duckey77
2022-03-04 16:02:38 -07:00
parent 6c9a9b7910
commit 97f96519d9
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Classes/PCSX2GameCore.mm
+4 -4
View File
@@ -53,7 +53,7 @@
#include <OpenGL/gl3ext.h>
static bool ExitRequested = false;
static bool LoadingSaveState = false;
static bool WaitRequested = false;
static bool isExecuting = false;
bool renderswitch = false;
@@ -342,7 +342,7 @@ static NSString *binCueFix(NSString *path)
continue;
case VMState::Running:
if (!LoadingSaveState) {
if (!WaitRequested) {
isExecuting = true;
VMManager::Execute();
isExecuting = false;
@@ -447,12 +447,12 @@ static NSString *binCueFix(NSString *path)
return;
}
LoadingSaveState = true;
WaitRequested = true;
while(isExecuting)
usleep(50);
bool success = VMManager::LoadState(fileName.fileSystemRepresentation);
LoadingSaveState = false;
WaitRequested = false;
block(success, success ? nil : [NSError errorWithDomain:OEGameCoreErrorDomain code:OEGameCoreCouldNotLoadStateError userInfo:@{NSLocalizedDescriptionKey : @"PCSX2 Could not load the current state.",NSFilePathErrorKey: fileName}]);
}