Allow usedistinctiveringdetection and distinctiveringaftercid to be reset during...

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 5a7f562a1645d241ec42fcc519249926669c4bd1..444629484d33a0a072250ff1f77e675fd409eed7 100644 (file)
--- 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")) {