Merge pull request libretro#5491 from bkoropoff/minor-cleanup

Minor cleanup
mme4crt · Oct 1, 2017 · d254dec · d254dec
2 parents 9f591fc + 1aff508
commit d254dec
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGES.md b/CHANGES.md
@@ -24,6 +24,8 @@
 - WII: Use custom, embedded libogc SDK.
 - WIIU: Initial touchscreen support for WiiU gamepad.
 - SCANNER: Fix archive scanning.
+- SCANNER: Support CHD files.
+- SCANNER: Use primary data track of disc images for CRC lookups rather than cue files.  This is slower but finds matches more reliably, and is necessary for CHD files to work at all.  Update your databases!
 
 # 1.6.7
 - SCANNER: Fix directory scanning.

diff --git a/libretro-common/streams/chd_stream.c b/libretro-common/streams/chd_stream.c
@@ -346,7 +346,6 @@ ssize_t chdstream_read(chdstream_t *stream, void *data, size_t bytes)
 
          if (!chdstream_load_hunk(stream, hunk))
          {
-            abort();
             return -1;
          }
          memcpy(out + data_offset,