Mercurial > mplayer.hg

diff cfgparser.c @ 4220:fe2c20d52a25

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed a few bugs and added support for VCD/DVD/TV in playlist using virtual url like dvd://1 vcd://2 tv://5
author albeu
date Thu, 17 Jan 2002 20:24:28 +0000
parents 22fadd4022b5
children f04c49aa2408
line wrap: on
line diff
--- a/cfgparser.c	Thu Jan 17 19:24:33 2002 +0000
+++ b/cfgparser.c	Thu Jan 17 20:24:28 2002 +0000
@@ -300,7 +300,7 @@
 
 	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 @@
 			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);