sdl: fixed --nogui option and removed SDL.NoGUI from fceux.cfg

This commit is contained in:
plombo 2011-07-05 20:28:37 +00:00
parent 36a2723fe4
commit a0b26b8b2b
2 changed files with 11 additions and 5 deletions

View File

@ -223,8 +223,6 @@ InitConfig()
config->addOption("_laststatefrom", "SDL.LastLoadStateFrom", home_dir);
config->addOption("_lastopennsf", "SDL.LastOpenNSF", home_dir);
config->addOption("_lastsavestateas", "SDL.LastSaveStateAs", home_dir);
// option to disable gui (broken??)
config->addOption("nogui", "SDL.NoGUI", 0);
#endif
// fcm -> fm2 conversion

View File

@ -682,7 +682,13 @@ int main(int argc, char *argv[])
return 0;
}
// check for --help or -h and display usage
#ifdef _GTK
int noGui = 0;
#else
int noGui = 1;
#endif
// check for --help or -h and display usage; also check for --nogui
for(int i=0; i<argc;i++)
{
if(strcmp(argv[i], "--help") == 0 || strcmp(argv[i], "-h") == 0)
@ -691,6 +697,10 @@ int main(int argc, char *argv[])
SDL_Quit();
return 0;
}
#ifdef _GTK
else if(strcmp(argv[i], "--nogui") == 0)
noGui = 1;
#endif
}
// if we're not compiling w/ the gui, exit if a rom isn't specified
@ -739,8 +749,6 @@ int main(int argc, char *argv[])
#ifdef _GTK
gtk_init(&argc, &argv);
int noGui;
g_config->getOption("SDL.NoGUI", &noGui);
if(noGui == 0)
InitGTKSubsystem(argc, argv);
#endif