From 22bbabf6807d704b1a8c9231d55f139e3e00b8dd Mon Sep 17 00:00:00 2001 From: notaz Date: Mon, 28 Jan 2013 02:47:12 +0200 Subject: [PATCH] merge minor fixes from pcsxr my own code.. --- libpcsxcore/cdriso.c | 8 +++++--- libpcsxcore/cdrom.c | 5 +++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/libpcsxcore/cdriso.c b/libpcsxcore/cdriso.c index 90c9d856..21203da8 100644 --- a/libpcsxcore/cdriso.c +++ b/libpcsxcore/cdriso.c @@ -470,10 +470,12 @@ static int parsecue(const char *isofile) { // build a path for files referenced in .cue strncpy(filepath, cuename, sizeof(filepath)); - tmp = strrchr(filepath, '/') + 1; - if (tmp == NULL) - tmp = strrchr(filepath, '\\') + 1; + tmp = strrchr(filepath, '/'); if (tmp == NULL) + tmp = strrchr(filepath, '\\'); + if (tmp != NULL) + tmp++; + else tmp = filepath; *tmp = 0; filepath[sizeof(filepath) - 1] = 0; diff --git a/libpcsxcore/cdrom.c b/libpcsxcore/cdrom.c index ca7f9f7b..966bb702 100644 --- a/libpcsxcore/cdrom.c +++ b/libpcsxcore/cdrom.c @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the * * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * ***************************************************************************/ -/* +/* * Handles all CD-ROM registers and functions. */ @@ -1448,6 +1448,7 @@ void cdrReset() { cdr.Reg2 = 0x1f; cdr.Stat = NoIntr; cdr.DriveState = DRIVESTATE_STANDBY; + cdr.StatP = STATUS_ROTATING; pTransfer = cdr.Transfer; // BIOS player - default values -- 2.39.5