summaryrefslogtreecommitdiff
path: root/channels/chan_zap.c
diff options
context:
space:
mode:
authorJoshua Colp <jcolp@digium.com>2007-01-10 04:21:46 +0000
committerJoshua Colp <jcolp@digium.com>2007-01-10 04:21:46 +0000
commitf215636ef346026d322ad9dec774b4b940b2c7c4 (patch)
tree82281d1ffe743b915780fb9c97ecd658c1faacff /channels/chan_zap.c
parentfd06f299456989a03f0f61fe9289f501846e1d54 (diff)
Allow usedistinctiveringdetection and distinctiveringaftercid to be reset during a reload. (issue #8739 reported by tzafrir)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@50294 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_zap.c')
-rw-r--r--channels/chan_zap.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index 5a7f562a1..444629484 100644
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -11754,11 +11754,9 @@ static int process_zap(struct ast_variable *v, int reload, int skipchannels)
return -1;
}
} else if (!strcasecmp(v->name, "usedistinctiveringdetection")) {
- if (ast_true(v->value))
- usedistinctiveringdetection = 1;
+ usedistinctiveringdetection = ast_true(v->value);
} else if (!strcasecmp(v->name, "distinctiveringaftercid")) {
- if (ast_true(v->value))
- distinctiveringaftercid = 1;
+ distinctiveringaftercid = ast_true(v->value);
} else if (!strcasecmp(v->name, "dring1context")) {
ast_copy_string(drings.ringContext[0].contextData,v->value,sizeof(drings.ringContext[0].contextData));
} else if (!strcasecmp(v->name, "dring2context")) {