Merged revisions 89241 via svnmerge from
authorMark Michelson <mmichelson@digium.com>
Tue, 13 Nov 2007 16:03:10 +0000 (16:03 +0000)
committerMark Michelson <mmichelson@digium.com>
Tue, 13 Nov 2007 16:03:10 +0000 (16:03 +0000)
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

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89242 65c4cc65-6c06-0410-ace0-fbb531ad65f3

apps/app_mixmonitor.c

index cfe40b0..9c8ba0b 100644 (file)
@@ -309,7 +309,7 @@ static int mixmonitor_exec(struct ast_channel *chan, void *data)
                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 @@ static int mixmonitor_exec(struct ast_channel *chan, void *data)
        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;
 }