summaryrefslogtreecommitdiffstats
path: root/stream/stream_dvb.c
diff options
context:
space:
mode:
authornicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-03-03 22:28:07 +0000
committernicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-03-03 22:28:07 +0000
commitb867e955844a815b983ec6adf2944739a54fa621 (patch)
treec37874116ac60e12b0f8e7a8fa9d07946d25dc8c /stream/stream_dvb.c
parentdb9f691b6cc0f814205011ddab476a6a8e54f03e (diff)
downloadmpv-b867e955844a815b983ec6adf2944739a54fa621.tar.bz2
mpv-b867e955844a815b983ec6adf2944739a54fa621.tar.xz
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
Diffstat (limited to 'stream/stream_dvb.c')
-rw-r--r--stream/stream_dvb.c6
1 files changed, 6 insertions, 0 deletions
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);