X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fgui%2Fmainwin.cpp;h=b8a7de0f610526534ee267d54edfc146133238ac;hb=576a7bd6373a53d9cff6a7bb88334429469e0751;hp=ea4f8d46156b273f93cc936f04562bcfa36ffdb8;hpb=19cb30261693d5c56c79d87030cfe8e1dc9ca033;p=virtualjaguar

diff --git a/src/gui/mainwin.cpp b/src/gui/mainwin.cpp
index ea4f8d4..b8a7de0 100644
--- a/src/gui/mainwin.cpp
+++ b/src/gui/mainwin.cpp
@@ -260,13 +260,15 @@ MainWin::MainWin(QString filenameToRun): running(true), powerButtonOn(false),
 	WriteLog("Virtual Jaguar %s (Last full build was on %s %s)\n", VJ_RELEASE_VERSION, __DATE__, __TIME__);
 	WriteLog("VJ: Initializing jaguar subsystem...\n");
 	JaguarInit();
+	memcpy(jagMemSpace + 0xE00000, jaguarBootROM, 0x20000);	// Use the stock BIOS
 
+	// Check for filename passed in on the command line...
 	if (!filenameToRun.isEmpty())
 	{
 		loadAndGo = true;
 		// Attempt to load/run the file the user passed in...
 		LoadSoftware(filenameToRun);
-		memcpy(jagMemSpace + 0xE00000, jaguarBootROM, 0x20000);	// Use the stock BIOS
+//		memcpy(jagMemSpace + 0xE00000, jaguarBootROM, 0x20000);	// Use the stock BIOS
 		// Prevent the scanner from running...
 		return;
 	}
@@ -292,9 +294,11 @@ MainWin::MainWin(QString filenameToRun): running(true), powerButtonOn(false),
 		// Prevent the scanner from running...
 		return;
 	}
-	else
-		memcpy(jagMemSpace + 0xE00000, jaguarBootROM, 0x20000);	// Otherwise, use the stock BIOS
+//	else
+//		memcpy(jagMemSpace + 0xE00000, jaguarBootROM, 0x20000);	// Otherwise, use the stock BIOS
 
+	// Run the scanner if nothing passed in and *not* Alpine mode...
+	// NB: Really need to look into caching the info scanned in here...
 	filePickWin->ScanSoftwareFolder(allowUnknownSoftware);
 }