diff options
| author | SND\shalma_cp <SND\shalma_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2010-12-11 17:54:31 +0000 |
|---|---|---|
| committer | SND\shalma_cp <SND\shalma_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2010-12-11 17:54:31 +0000 |
| commit | d58b2a17cdc6e3f6ad3691bb59bd999a0b449f15 (patch) | |
| tree | e6bb9ec1dcb05672095c7745292f8b7f79491083 /macosx/EmuThread.m | |
| parent | 2975b7e2847b0197f164a3d05233546ae15c8785 (diff) | |
| download | pcsxr-d58b2a17cdc6e3f6ad3691bb59bd999a0b449f15.tar.gz | |
wndmain.c, lnxmain.c, gtk2gui.c, emuthread.m
- Patch 7713
- (dario86) Detect PAL demos (SCED)
- (dario86) Fix PAL auto-detection with root counter init
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@61080 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'macosx/EmuThread.m')
| -rw-r--r-- | macosx/EmuThread.m | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/macosx/EmuThread.m b/macosx/EmuThread.m index 941d77da..dfcf6141 100644 --- a/macosx/EmuThread.m +++ b/macosx/EmuThread.m @@ -56,15 +56,16 @@ static pthread_mutex_t eventMutex; setjmp(restartJmp); - EmuReset(); - int res = CheckCdrom(); if (res == -1) { ClosePlugins(); SysMessage(_("Could not check CD-ROM!\n")); goto done; } - +
+ // Auto-detect: region first, then rcnt reset + EmuReset();
+
LoadCdrom(); if (defrostPath) { |