cdriso: merge from pcsxr r90558

Author: edgbla
cdriso: cbn/cbin detection fix;

diff --git a/libpcsxcore/cdriso.c b/libpcsxcore/cdriso.c
index d6672f9..2c9e692 100644 (file)
--- a/libpcsxcore/cdriso.c
+++ b/libpcsxcore/cdriso.c
@@ -795,6 +795,8 @@ static int handlepbp(const char *isofile) {
        if (ext == NULL || (strcmp(ext, ".pbp") != 0 && strcmp(ext, ".PBP") != 0))
                return -1;
 
+       fseek(cdHandle, 0, SEEK_SET);
+
        numtracks = 0;
 
        ret = fread(&pbp_hdr, 1, sizeof(pbp_hdr), cdHandle);
@@ -958,6 +960,8 @@ static int handlecbin(const char *isofile) {
        if (ext == NULL || (strcasecmp(ext + 1, ".cbn") != 0 && strcasecmp(ext, ".cbin") != 0))
                return -1;
 
+       fseek(cdHandle, 0, SEEK_SET);
+
        ret = fread(&ciso_hdr, 1, sizeof(ciso_hdr), cdHandle);
        if (ret != sizeof(ciso_hdr)) {
                SysPrintf("failed to read ciso header\n");