[svn-commits] mmichelson: trunk r89242 - in /trunk: ./ apps/app_mixmonitor.c

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Tue Nov 13 10:03:10 2007
New Revision: 89242

URL: http://svn.digium.com/view/asterisk?view=rev&rev=89242
Log:
Merged revisions 89241 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r89241 | mmichelson | 2007-11-13 10:02:02 -0600 (Tue, 13 Nov 2007) | 5 lines

Reverting commit made in revision 89205 since it is unnecessary.

Thanks to Kevin for pointing this out


........

Modified:
    trunk/   (props changed)
    trunk/apps/app_mixmonitor.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/apps/app_mixmonitor.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_mixmonitor.c?view=diff&rev=89242&r1=89241&r2=89242
==============================================================================
--- trunk/apps/app_mixmonitor.c (original)
+++ trunk/apps/app_mixmonitor.c Tue Nov 13 10:03:10 2007
@@ -309,7 +309,7 @@
 		return -1;
 	}
 
-	if (args.argc > 1 && args.options) {
+	if (args.options) {
 		char *opts[OPT_ARG_ARRAY_SIZE] = { NULL, };
 
 		ast_app_parse_options(mixmonitor_opts, &flags, opts, args.options);
@@ -360,7 +360,7 @@
 	ast_mkdir(tmp, 0777);
 
 	pbx_builtin_setvar_helper(chan, "MIXMONITOR_FILENAME", args.filename);
-	launch_monitor_thread(chan, args.filename, flags.flags, readvol, writevol, args.argc > 2 ? args.post_process : "");
+	launch_monitor_thread(chan, args.filename, flags.flags, readvol, writevol, args.post_process);
 
 	return 0;
 }