diff options
author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-07-08 11:03:18 +0000 |
---|---|---|
committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-07-08 11:03:18 +0000 |
commit | d121c0061b3fc2e8a3d52e3ef64d368206fd53fe (patch) | |
tree | edfa00b7ca710d7e8d05c7fc21a8120b2f8ac551 /mplayer.c | |
parent | 1b51da21f55ffbe8b98554de13ed4e922d4cc603 (diff) | |
download | mpv-d121c0061b3fc2e8a3d52e3ef64d368206fd53fe.tar.bz2 mpv-d121c0061b3fc2e8a3d52e3ef64d368206fd53fe.tar.xz |
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
Diffstat (limited to 'mplayer.c')
-rw-r--r-- | mplayer.c | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -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); |