summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2009-11-30 17:22:43 +0000
committerSND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2009-11-30 17:22:43 +0000
commit7977176cbce97a52491c79f51950cd8aa43a656f (patch)
tree710a85c453ac6fe092c50cec62d59ee03d873e67
parenta2eeda2baeb774dbab1209f6d856f9c605dc8b3b (diff)
downloadpcsxr-7977176cbce97a52491c79f51950cd8aa43a656f.tar.gz
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@38517 e17a0e51-4ae3-4d35-97c3-1a29b211df97
-rw-r--r--ChangeLog3
-rw-r--r--plugins/dfcdrom/cdr-linux.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 05daa2e8..60e23eb6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
December 1, 2009 Wei Mingzhi <weimingzhi@gmail.com>
- * plugins/dfcdrom/cdr-linux.c: Fixed crash bug when resuming emulation.
+ * plugins/dfcdrom/cdr-linux.c: Fixed crash bug when resuming emulation in
+ Threaded mode.
November 30, 2009 Wei Mingzhi <weimingzhi@gmail.com>
diff --git a/plugins/dfcdrom/cdr-linux.c b/plugins/dfcdrom/cdr-linux.c
index 93ed2c6d..ddf81767 100644
--- a/plugins/dfcdrom/cdr-linux.c
+++ b/plugins/dfcdrom/cdr-linux.c
@@ -261,7 +261,7 @@ long ReadThreaded() {
unsigned char* GetBThreaded() {
PRINTF("threadc %d\n", found);
- if (found == 1) { /*found = 0;*/ return cdbuffer; }
+ if (found == 1) return cdbuffer;
cdbuffer = cdcache[0].cr.buf + 12;
while (btoi(cdbuffer[0]) != cr.msf.cdmsf_min0 ||
btoi(cdbuffer[1]) != cr.msf.cdmsf_sec0 ||