X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fvj.cpp;h=72b84ad8f011d986775cd01788f35214caef72e5;hb=022ea8444d3a2ff684eadd759289ade3ead1acf9;hp=74a5629850f64d497c206cc117e1844b8933593a;hpb=8a2e0984567564b6d0124d5d0ffbca39c4ad2957;p=virtualjaguar

diff --git a/src/vj.cpp b/src/vj.cpp
index 74a5629..72b84ad 100644
--- a/src/vj.cpp
+++ b/src/vj.cpp
@@ -159,8 +159,9 @@ int main(int argc, char * argv[])
     }
 
 	// Set up SDL library
-	if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_AUDIO | SDL_INIT_TIMER
-		| SDL_INIT_CDROM | SDL_INIT_NOPARACHUTE) < 0)
+	if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_AUDIO | SDL_INIT_TIMER) < 0)
+//		| SDL_INIT_CDROM) < 0)
+//		| SDL_INIT_CDROM | SDL_INIT_NOPARACHUTE) < 0)
 	{
 		WriteLog("VJ: Could not initialize the SDL library: %s\n", SDL_GetError());
 		return -1;
@@ -197,7 +198,8 @@ WriteLog("Initializing GUI subsystem...\n");
 //	JaguarLoadCart(jaguar_mainRom, (haveCart ? argv[1] : vjs.ROMPath));
 //Need to find a better way to handle this crap...
 WriteLog("About to start GUI...\n");
-	GUIMain();
+//	GUIMain();
+	GUIMain(haveCart ? argv[1] : NULL);
 
 /*	jaguar_reset();
 	
@@ -278,7 +280,8 @@ WriteLog("About to start GUI...\n");
 	log_done();	
 
 	// Free SDL components last...!
-	SDL_QuitSubSystem(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_AUDIO | SDL_INIT_TIMER | SDL_INIT_CDROM);
+//	SDL_QuitSubSystem(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_AUDIO | SDL_INIT_TIMER | SDL_INIT_CDROM);
+	SDL_QuitSubSystem(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_AUDIO | SDL_INIT_TIMER);
 	SDL_Quit();
 
     return 0;