From d121c0061b3fc2e8a3d52e3ef64d368206fd53fe Mon Sep 17 00:00:00 2001 From: reimar Date: Sat, 8 Jul 2006 11:03:18 +0000 Subject: [PATCH] Change use_gui detection to accept also filenames only containing gmplayer, like "gmplayer.exe", "gmplayer_old" etc. Also removes (somewhat broken) WIN32 special-case git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18944 b3059339-0415-0410-9bf9-f77b7e298cf2 --- mplayer.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/mplayer.c b/mplayer.c index ff7ecb67a9..6d4cabead1 100644 --- a/mplayer.c +++ b/mplayer.c @@ -2623,16 +2623,16 @@ int gui_no_filename=0; 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);