[MPlayer-cvslog] CVS: main parser-mecmd.c,1.11,1.12

[Alban Bedel CVS]

CVS change done by Alban Bedel CVS

Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv4742

Modified Files:
	parser-mecmd.c 
Log Message:
Fix multiple help clauses on the command line with mencoder.


Index: parser-mecmd.c
===================================================================
RCS file: /cvsroot/mplayer/main/parser-mecmd.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- parser-mecmd.c	2 Sep 2005 08:29:30 -0000	1.11
+++ parser-mecmd.c	23 Jan 2006 11:33:18 -0000	1.12
@@ -93,6 +93,10 @@
 	}
 	if(!entry || (mp_opt->flags & M_OPT_GLOBAL)){
 	  tmp = m_config_set_option(config, opt, argv[i + 1]);
+	  if (tmp <= M_OPT_EXIT) {
+	    opt_exit = 1;
+	    tmp = M_OPT_EXIT - tmp;
+	  }
 	  if(tmp < 0){
 //	    mp_msg(MSGT_CFGPARSER, MSGL_ERR, "m_config_set_option() failed (%d)\n",tmp);
 	    goto err_out;