merge minor fixes from pcsxr

my own code..

diff --git a/libpcsxcore/cdriso.c b/libpcsxcore/cdriso.c
index 90c9d85..21203da 100644 (file)
--- 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 (file)
--- 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