[asterisk-commits] murf: branch 1.6.0 r124542 - in /branches/1.6.0: ./ apps/app_forkcdr.c

[SVN commits to the Asterisk project]

Author: murf
Date: Sat Jun 21 22:18:10 2008
New Revision: 124542

URL: http://svn.digium.com/view/asterisk?view=rev&rev=124542
Log:
Merged revisions 124541 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r124541 | murf | 2008-06-21 20:58:06 -0600 (Sat, 21 Jun 2008) | 17 lines

Merged revisions 124540 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r124540 | murf | 2008-06-21 20:54:52 -0600 (Sat, 21 Jun 2008) | 9 lines

(closes issue #12910)
Reported by: rossnick

Sorry, my testing did not contain the simple case of forkCDR(v),
I am much embarrassed to admit.  If I had, I would have 
more solidly initialized the opts element for varset.



........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/apps/app_forkcdr.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/apps/app_forkcdr.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/apps/app_forkcdr.c?view=diff&rev=124542&r1=124541&r2=124542
==============================================================================
--- branches/1.6.0/apps/app_forkcdr.c (original)
+++ branches/1.6.0/apps/app_forkcdr.c Sat Jun 21 22:18:10 2008
@@ -225,10 +225,10 @@
 
 	AST_STANDARD_APP_ARGS(arglist, argcopy);
 
-	if (!ast_strlen_zero(arglist.options)) {
+	opts[OPT_ARG_VARSET] = 0;
+
+	if (!ast_strlen_zero(arglist.options))
 		ast_app_parse_options(forkcdr_exec_options, &flags, opts, arglist.options);
-	} else
-		opts[OPT_ARG_VARSET] = 0;
 	
 	if (!ast_strlen_zero(data))
 		ast_set2_flag(chan->cdr, ast_test_flag(&flags, OPT_KEEPVARS), AST_CDR_FLAG_KEEP_VARS);