# HG changeset patch # User reimar # Date 1152356598 0 # Node ID cde5b56f161068322f52e08b2d16ecde35f731c9 # Parent 70eec1cad08015a02e36bedc2f2fb4666b06ea5d Change use_gui detection to accept also filenames only containing gmplayer, like "gmplayer.exe", "gmplayer_old" etc. Also removes (somewhat broken) WIN32 special-case diff -r 70eec1cad080 -r cde5b56f1610 mplayer.c --- a/mplayer.c Fri Jul 07 18:27:58 2006 +0000 +++ b/mplayer.c Sat Jul 08 11:03:18 2006 +0000 @@ -2623,16 +2623,16 @@ tv_param_immediate = 1; #endif -#if defined(WIN32) && defined(HAVE_NEW_GUI) - char *cmdline = GetCommandLine(); - if(!strstr(cmdline, "-slave")) - use_gui=1; -#else if ( argv[0] ) - if(!strcmp(argv[0],"gmplayer") || - (strrchr(argv[0],'/') && !strcmp(strrchr(argv[0],'/'),"/gmplayer") ) ) + { + char *base = strrchr(argv[0], '/'); + if (!base) + base = strrchr(argv[0], '\\'); + if (!base) + base = argv[0]; + if(strstr(base, "gmplayer")) use_gui=1; -#endif + } mconfig = m_config_new(); m_config_register_options(mconfig,mplayer_opts);