diff options
| author | notaz | 2013-01-28 02:47:12 +0200 |
|---|---|---|
| committer | notaz | 2013-01-28 02:47:12 +0200 |
| commit | 22bbabf6807d704b1a8c9231d55f139e3e00b8dd (patch) | |
| tree | 2dd4a3e0bb121ca0b933492a3c1f3dfb9ec82878 | |
| parent | deebc67fc5c5027248842562e02d71d5f683a1e2 (diff) | |
| download | pcsx_rearmed-22bbabf6807d704b1a8c9231d55f139e3e00b8dd.tar.gz pcsx_rearmed-22bbabf6807d704b1a8c9231d55f139e3e00b8dd.tar.bz2 pcsx_rearmed-22bbabf6807d704b1a8c9231d55f139e3e00b8dd.zip | |
merge minor fixes from pcsxr
my own code..
| -rw-r--r-- | libpcsxcore/cdriso.c | 8 | ||||
| -rw-r--r-- | libpcsxcore/cdrom.c | 5 |
2 files changed, 8 insertions, 5 deletions
diff --git a/libpcsxcore/cdriso.c b/libpcsxcore/cdriso.c index 90c9d85..21203da 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 ca7f9f7..966bb70 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 |