From 767f6bf6bd409cfe67670167278c73f5e3c611aa Mon Sep 17 00:00:00 2001 From: Shamus Hammons Date: Tue, 1 Jun 2004 19:17:26 +0000 Subject: [PATCH] Passes cart name to GUI if invoked on cmd line --- src/vj.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) 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; -- 2.37.2