diff options
| author | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2010-01-31 13:40:38 +0000 |
|---|---|---|
| committer | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2010-01-31 13:40:38 +0000 |
| commit | a587fec3ed0b06761c407ce775337a4f28d5302b (patch) | |
| tree | 0279c7f38197d12e6a42d95a9a65a4d72d54add2 | |
| parent | 9dfc93a3ee0b0b6b17a240bc24046063fbcc1476 (diff) | |
| download | pcsxr-a587fec3ed0b06761c407ce775337a4f28d5302b.tar.gz | |
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@40991 e17a0e51-4ae3-4d35-97c3-1a29b211df97
| -rw-r--r-- | macosx/EmuThread.m | 12 | ||||
| -rw-r--r-- | macosx/Pcsx.xcodeproj/project.pbxproj | 2 |
2 files changed, 5 insertions, 9 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 } diff --git a/macosx/Pcsx.xcodeproj/project.pbxproj b/macosx/Pcsx.xcodeproj/project.pbxproj index 78c8fc86..1a9ec9aa 100644 --- a/macosx/Pcsx.xcodeproj/project.pbxproj +++ b/macosx/Pcsx.xcodeproj/project.pbxproj @@ -221,7 +221,7 @@ 2BA44360052DB2EA00E21DDD /* PcsxPlugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PcsxPlugin.h; sourceTree = "<group>"; }; 2BA44361052DB2EA00E21DDD /* PcsxPlugin.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = PcsxPlugin.m; sourceTree = "<group>"; tabWidth = 4; usesTabs = 0; }; 2BB3D6CF05427FE200831ACB /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = Info.plist; sourceTree = "<group>"; }; - 2BB3D6D105427FE200831ACB /* PCSX.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = PCSX.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 2BB3D6D105427FE200831ACB /* PCSX.app */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.application; path = PCSX.app; sourceTree = BUILT_PRODUCTS_DIR; }; 2BBB1126051DC00500B84448 /* PluginList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginList.h; sourceTree = "<group>"; }; 2BBB1127051DC00500B84448 /* PluginList.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PluginList.m; sourceTree = "<group>"; }; 2BBB1787051E0D9700B84448 /* English */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = English; path = Credits.rtf; sourceTree = "<group>"; }; |