From: notaz <notasas@gmail.com>
Date: Sun, 21 Dec 2014 18:43:23 +0000 (+0200)
Subject: cdriso: merge from pcsxr r90558
X-Git-Tag: r20~13
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=commitdiff_plain;h=9726a4aff95e362af3df014a02185031911bf784

cdriso: merge from pcsxr r90558

Author: edgbla
cdriso: cbn/cbin detection fix;
---

diff --git a/libpcsxcore/cdriso.c b/libpcsxcore/cdriso.c
index d6672f98..2c9e692d 100644
--- 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");