summaryrefslogtreecommitdiff
path: root/macosx/EmuThread.m
diff options
context:
space:
mode:
authorSND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2010-01-31 13:40:38 +0000
committerSND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2010-01-31 13:40:38 +0000
commita587fec3ed0b06761c407ce775337a4f28d5302b (patch)
tree0279c7f38197d12e6a42d95a9a65a4d72d54add2 /macosx/EmuThread.m
parent9dfc93a3ee0b0b6b17a240bc24046063fbcc1476 (diff)
downloadpcsxr-a587fec3ed0b06761c407ce775337a4f28d5302b.tar.gz
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@40991 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'macosx/EmuThread.m')
-rw-r--r--macosx/EmuThread.m12
1 files changed, 4 insertions, 8 deletions
diff --git a/macosx/EmuThread.m b/macosx/EmuThread.m
index 07f7d33c..9eba8649 100644
--- a/macosx/EmuThread.m
+++ b/macosx/EmuThread.m
@@ -54,9 +54,9 @@ static pthread_mutex_t eventMutex;
if (OpenPlugins() == -1)
goto done;
- if (setjmp(restartJmp) == 0) {
- psxReset();
- }
+ setjmp(restartJmp);
+
+ psxReset();
int res = CheckCdrom();
if (res == -1) {
@@ -104,9 +104,7 @@ done:
if (OpenPlugins() == -1)
goto done;
- if (setjmp(restartJmp) == 0) {
- psxReset();
- }
+ psxReset();
psxCpu->Execute();
@@ -191,8 +189,6 @@ done:
safeEvent &= ~EMUEVENT_RESET;
pthread_mutex_unlock(&eventMutex);
- psxReset();
-
longjmp(restartJmp, 0);
#endif
}