Mercurial > mplayer.hg

changeset 8458:92a7bf835d98

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2*10l=20l
author arpi
date Sun, 15 Dec 2002 17:05:35 +0000
parents 829641e90aba
children 2ce7bbdcee15
files parser-mpcmd.c
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/parser-mpcmd.c	Sun Dec 15 17:00:56 2002 +0000
+++ b/parser-mpcmd.c	Sun Dec 15 17:05:35 2002 +0000
@@ -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]);