X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libpcsxcore%2Fmisc.c;h=3d1647102104209aede928ef76ac91572ec6455a;hb=86c70511f865fa7b01fe0147f1c891b8fbc10a97;hp=ab3e1a486ea7503231c452014d7cbd944265ad1a;hpb=4f13a57754959faa674e898d5d9147d302e72684;p=pcsx_rearmed.git

diff --git a/libpcsxcore/misc.c b/libpcsxcore/misc.c
index ab3e1a48..3d164710 100644
--- a/libpcsxcore/misc.c
+++ b/libpcsxcore/misc.c
@@ -261,7 +261,7 @@ int LoadCdrom() {
 	tmpHead.t_addr = SWAP32(tmpHead.t_addr);
 
 	psxCpu->Clear(tmpHead.t_addr, tmpHead.t_size / 4);
-	psxCpu->Reset();
+	//psxCpu->Reset();
 
 	// Read the rest of the main executable
 	while (tmpHead.t_size & ~2047) {
@@ -288,6 +288,9 @@ int LoadCdromFile(const char *filename, EXE_HEADER *head) {
 	u32 size, addr;
 	void *mem;
 
+	if (filename == INVALID_PTR)
+		return -1;
+
 	p1 = filename;
 	if ((p2 = strchr(p1, ':')))
 		p1 = p2 + 1;
@@ -311,11 +314,11 @@ int LoadCdromFile(const char *filename, EXE_HEADER *head) {
 	READTRACK();
 
 	memcpy(head, buf + 12, sizeof(EXE_HEADER));
-	size = head->t_size;
-	addr = head->t_addr;
+	size = SWAP32(head->t_size);
+	addr = SWAP32(head->t_addr);
 
 	psxCpu->Clear(addr, size / 4);
-	psxCpu->Reset();
+	//psxCpu->Reset();
 
 	while (size & ~2047) {
 		incTime();