diff options
| author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-11-13 16:03:10 +0000 |
|---|---|---|
| committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-11-13 16:03:10 +0000 |
| commit | dda901eb6f61ceaa2471a22242fd1298f5435628 (patch) | |
| tree | ba9b70008c415c45cf262e879e68d74a684fe73b /apps | |
| parent | 5f2ad1136a82346f7aadda0882c6965bf2fe2a16 (diff) | |
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
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@89242 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_mixmonitor.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/app_mixmonitor.c b/apps/app_mixmonitor.c index cfe40b01f..9c8ba0b35 100644 --- a/apps/app_mixmonitor.c +++ b/apps/app_mixmonitor.c @@ -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; } |