summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2009-11-30 17:14:12 +0000
committerSND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2009-11-30 17:14:12 +0000
commita2eeda2baeb774dbab1209f6d856f9c605dc8b3b (patch)
treebfb493e16d5a09a3044d025ac67da60acf83c039
parente2ebb5e656966be6687caa1252dc357a00cdfdc2 (diff)
downloadpcsxr-a2eeda2baeb774dbab1209f6d856f9c605dc8b3b.tar.gz
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@38516 e17a0e51-4ae3-4d35-97c3-1a29b211df97
-rw-r--r--ChangeLog4
-rw-r--r--plugins/dfcdrom/cdr-linux.c2
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 4ef1d09f..05daa2e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+December 1, 2009 Wei Mingzhi <weimingzhi@gmail.com>
+
+ * plugins/dfcdrom/cdr-linux.c: Fixed crash bug when resuming emulation.
+
November 30, 2009 Wei Mingzhi <weimingzhi@gmail.com>
* macosx/plugins/DFSound/PeopsSPU.xcodeproj/project.pbxproj: Changed build
diff --git a/plugins/dfcdrom/cdr-linux.c b/plugins/dfcdrom/cdr-linux.c
index 9ef40039..93ed2c6d 100644
--- a/plugins/dfcdrom/cdr-linux.c
+++ b/plugins/dfcdrom/cdr-linux.c
@@ -97,6 +97,8 @@ long CDRopen(void) {
cdcache = (CacheData *)malloc(CacheSize * sizeof(CacheData));
if (cdcache == NULL) return -1;
memset(cdcache, 0, CacheSize * sizeof(CacheData));
+
+ found = 0;
} else {
cdbuffer = cr.buf + 12; /* skip sync data */
}