diff options
| author | albeu <albeu@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-01-17 20:24:28 +0000 |
|---|---|---|
| committer | albeu <albeu@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-01-17 20:24:28 +0000 |
| commit | 61185827265fe4f611b443c402da61749b37ef82 (patch) | |
| tree | 8e0124d187c15b146c439811461ee851d8e838e0 /cfgparser.c | |
| parent | 9870d682a4140bb918c92ebd9359f2d8df987a65 (diff) | |
| download | mpv-61185827265fe4f611b443c402da61749b37ef82.tar.bz2 mpv-61185827265fe4f611b443c402da61749b37ef82.tar.xz | |
Fixed a few bugs and added support for VCD/DVD/TV in playlist using virtual url
like dvd://1 vcd://2 tv://5
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4221 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'cfgparser.c')
| -rw-r--r-- | cfgparser.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cfgparser.c b/cfgparser.c index 69b87b777e..4ea1edb299 100644 --- a/cfgparser.c +++ b/cfgparser.c @@ -300,7 +300,7 @@ static int config_read_option(m_config_t *config,config_t** conf_list, char *opt mp_msg(MSGT_CFGPARSER, MSGL_DBG3, "read_option: conf=%p opt='%s' param='%s'\n", conf, opt, param); - for(nconf = 0 ; conf_list&& conf_list[nconf] != NULL; nconf++) { + for(nconf = 0 ; conf_list[nconf] != NULL; nconf++) { conf = conf_list[nconf]; for (i = 0; conf[i].name != NULL; i++) { int namelength; @@ -563,7 +563,7 @@ static int config_read_option(m_config_t *config,config_t** conf_list, char *opt break; } out: - if(config->global == 0 && ! (conf[i].flags & CONF_GLOBAL)) { + if(ret >= 0 && config->global == 0 && ! (conf[i].flags & CONF_GLOBAL)) { play_tree_t* dest = config->last_entry ? config->last_entry : config->last_parent; #ifdef MP_DEBUG assert(dest != NULL); |