diff options
| author | Sean Bright <sean@malleable.com> | 2008-08-10 14:45:25 +0000 |
|---|---|---|
| committer | Sean Bright <sean@malleable.com> | 2008-08-10 14:45:25 +0000 |
| commit | 3ffb39833b25a02108214d7584733bc6b9c334df (patch) | |
| tree | 9d240f929d1efd30035a0505db16ba0f8e1ca439 /apps/app_forkcdr.c | |
| parent | 357bf3e90be71578e0b32303c41c5d29f2714c2b (diff) | |
More RSW merges. Everything from apps/ except for the big offenders
app_voicemail and app_queue.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@137055 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_forkcdr.c')
| -rw-r--r-- | apps/app_forkcdr.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/apps/app_forkcdr.c b/apps/app_forkcdr.c index b92e3de32..b2e4f307d 100644 --- a/apps/app_forkcdr.c +++ b/apps/app_forkcdr.c @@ -229,9 +229,11 @@ static int forkcdr_exec(struct ast_channel *chan, void *data) if (!ast_strlen_zero(arglist.options)) ast_app_parse_options(forkcdr_exec_options, &flags, opts, arglist.options); - - if (!ast_strlen_zero(data)) - ast_set2_flag(chan->cdr, ast_test_flag(&flags, OPT_KEEPVARS), AST_CDR_FLAG_KEEP_VARS); + + if (!ast_strlen_zero(data)) { + int keepvars = ast_test_flag(&flags, OPT_KEEPVARS) ? 1 : 0; + ast_set2_flag(chan->cdr, keepvars, AST_CDR_FLAG_KEEP_VARS); + } ast_cdr_fork(chan, flags, opts[OPT_ARG_VARSET]); |