From b867e955844a815b983ec6adf2944739a54fa621 Mon Sep 17 00:00:00 2001 From: nicodvb Date: Mon, 3 Mar 2008 22:28:07 +0000 Subject: search channels.conf in mplayer's instdir if all other searches fail; patch by foxcore gmail com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26155 b3059339-0415-0410-9bf9-f77b7e298cf2 --- stream/stream_dvb.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/stream/stream_dvb.c b/stream/stream_dvb.c index 8b40b44a3f..b7976db509 100644 --- a/stream/stream_dvb.c +++ b/stream/stream_dvb.c @@ -815,6 +815,12 @@ dvb_config_t *dvb_get_config(void) if(conf_file) free(conf_file); conf_file = get_path("channels.conf"); + if((access(conf_file, F_OK | R_OK) != 0)) + { + if(conf_file) + free(conf_file); + conf_file = strdup(MPLAYER_CONFDIR "/channels.conf"); + } } list = dvb_get_channels(conf_file, type); -- cgit v1.2.3