xavi
/
pcsxr
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

OS X: remove a couple of erroneous comments 

Spin the waiting for the emulator into a Dispatch queue.

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@91778 e17a0e51-4ae3-4d35-97c3-1a29b211df97
This commit is contained in:
SND\MaddTheSane_cp 2014-10-02 05:22:50 +00:00
parent 2696434b4e
commit c460790f50
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
macosx/Source/PcsxrController.m
View File

@ -531,7 +531,6 @@ otherblock();\
[larg addToDictionary:argDict]; [larg addToDictionary:argDict];
}; };
// This block/argument does not need to be sorted
dispatch_block_t psxOut = ^{ dispatch_block_t psxOut = ^{
hasParsedAnArgument = YES; hasParsedAnArgument = YES;
LaunchArg *larg = [[LaunchArg alloc] initWithLaunchOrder:LaunchArgPreRun argument:kPCSXRArgumentLogOutput block:^{ LaunchArg *larg = [[LaunchArg alloc] initWithLaunchOrder:LaunchArgPreRun argument:kPCSXRArgumentLogOutput block:^{
@ -540,7 +539,6 @@ otherblock();\
[larg addToDictionary:argDict]; [larg addToDictionary:argDict];
}; };
// This block/argument does not need to be sorted
dispatch_block_t slowBoot = ^{ dispatch_block_t slowBoot = ^{
hasParsedAnArgument = YES; hasParsedAnArgument = YES;
LaunchArg *larg = [[LaunchArg alloc] initWithLaunchOrder:LaunchArgPreRun argument:kPCSXRArgumentSlowBoot block:^{ LaunchArg *larg = [[LaunchArg alloc] initWithLaunchOrder:LaunchArgPreRun argument:kPCSXRArgumentSlowBoot block:^{
@ -579,9 +577,12 @@ otherblock();\
NSString *path = FileTestBlock(); NSString *path = FileTestBlock();
LaunchArg *larg = [[LaunchArg alloc] initWithLaunchOrder:LaunchArgPostRun argument:kPCSXRArgumentFreeze block:^{ LaunchArg *larg = [[LaunchArg alloc] initWithLaunchOrder:LaunchArgPostRun argument:kPCSXRArgumentFreeze block:^{
if (![EmuThread isRunBios]) { if (![EmuThread isRunBios]) {
//Make sure the emulator is running // TODO: use another API to put up a timer, instead of sleeping
sleep(5); dispatch_async(dispatch_get_global_queue(0, 0), ^{
[EmuThread defrostAt:path]; //Make sure the emulator is running
sleep(5);
[EmuThread defrostAt:path];
});
} }
}]; }];
[larg addToDictionary:argDict]; [larg addToDictionary:argDict];