[Mplayer-cvslog] CVS: main parser-mpcmd.c,1.5,1.6

[Arpi of Ize]

Update of /cvsroot/mplayer/main
In directory mail:/var/tmp.root/cvs-serv32353

Modified Files:
	parser-mpcmd.c 
Log Message:
2*10l=20l


Index: parser-mpcmd.c
===================================================================
RCS file: /cvsroot/mplayer/main/parser-mpcmd.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- parser-mpcmd.c	15 Dec 2002 04:47:32 -0000	1.5
+++ parser-mpcmd.c	15 Dec 2002 17:05:35 -0000	1.6
@@ -238,7 +238,7 @@
 	  m_option_t* mp_opt = NULL;
 	  play_tree_t* entry = NULL;
 
-	  tmp = (i+1<argc) ? is_entry_option(opt,argv[i + 1],&entry) : 0;
+	  tmp = is_entry_option(opt,(i+1<argc) ? argv[i + 1] : NULL,&entry);
 	  if(tmp > 0)  { // It's an entry
 	    if(entry) {
 	      add_entry(entry);
@@ -254,7 +254,7 @@
                 tmp = (i+1<argc) ? m_config_set_option(config, opt, argv[i + 1])
 				 : m_config_set_option(config, opt, NULL);
 	      else {
-		tmp = (i+1<argc) ? m_config_check_option(config, opt, argv[i + 1]) : -1;
+		tmp = m_config_check_option(config, opt, (i+1<argc) ? argv[i + 1] : NULL);
 		if(tmp >= 0 && mode != DROP_LOCAL) {
 		  play_tree_t* pt = last_entry ? last_entry : last_parent;
 		  play_tree_set_param(pt,opt, argv[i + 1]);