summaryrefslogtreecommitdiffstats
path: root/cfgparser.c
diff options
context:
space:
mode:
Diffstat (limited to 'cfgparser.c')
-rw-r--r--cfgparser.c4
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);