diff options
| author | hizzlekizzle | 2020-04-26 16:10:42 -0500 |
|---|---|---|
| committer | GitHub | 2020-04-26 16:10:42 -0500 |
| commit | cab5a12e078d92cd5c0837ca1ecd0843b22c8fa0 (patch) | |
| tree | 0016f8a8318a9dcf338b21dda37ba064a06a9a05 | |
| parent | a29aadf94b7aa47c59b310f1630ddc5b26dff0a9 (diff) | |
| parent | 49942a161128c2194b6a6432091b97fcc9f3c24a (diff) | |
| download | pcsx_rearmed-cab5a12e078d92cd5c0837ca1ecd0843b22c8fa0.tar.gz pcsx_rearmed-cab5a12e078d92cd5c0837ca1ecd0843b22c8fa0.tar.bz2 pcsx_rearmed-cab5a12e078d92cd5c0837ca1ecd0843b22c8fa0.zip | |
Merge pull request #406 from cmitu/cdimage-async-patch
cdriso: fix a disk switching deadlock when closing a CD image
| -rw-r--r-- | libpcsxcore/cdriso.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libpcsxcore/cdriso.c b/libpcsxcore/cdriso.c index 07adbe6..c8eacb8 100644 --- a/libpcsxcore/cdriso.c +++ b/libpcsxcore/cdriso.c @@ -1768,7 +1768,10 @@ static long CALLBACK ISOclose(void) { memset(cdbuffer, 0, sizeof(cdbuffer)); CDR_getBuffer = ISOgetBuffer; - readThreadStop(); + if (Config.AsyncCD) { + readThreadStop(); + } + return 0; } |