From: Joshua Colp <jcolp@digium.com>
Date: Wed, 10 Jan 2007 04:21:46 +0000 (+0000)
Subject: Allow usedistinctiveringdetection and distinctiveringaftercid to be reset during... 
X-Git-Tag: 1.6.0-beta1~3^2~3507
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f215636ef346026d322ad9dec774b4b940b2c7c4;p=thirdparty%2Fasterisk.git

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
---

diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index 5a7f562a16..444629484d 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")) {