From ed7bdda7b02af34f6d36fbf28925867f2b6ae6c0 Mon Sep 17 00:00:00 2001 From: Joshua Colp Date: Tue, 16 Jan 2007 05:53:31 +0000 Subject: [PATCH] Add none as a valid callgroup/pickupgroup option. I consider it a bug that it would inherit it all the way down and not have any way to reset it to nothing - so that's why it is in 1.2. (issue #8296 reported by gkloepfer) git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@51085 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_zap.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/channels/chan_zap.c b/channels/chan_zap.c index 277a152c1d..73cc62741c 100644 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -10440,9 +10440,15 @@ static int setup_zap(int reload) } else if (!strcasecmp(v->name, "group")) { cur_group = ast_get_group(v->value); } else if (!strcasecmp(v->name, "callgroup")) { - cur_callergroup = ast_get_group(v->value); + if (!strcasecmp(v->value, "none")) + cur_callergroup = 0; + else + cur_callergroup = ast_get_group(v->value); } else if (!strcasecmp(v->name, "pickupgroup")) { - cur_pickupgroup = ast_get_group(v->value); + if (!strcasecmp(v->value, "none")) + cur_pickupgroup = 0; + else + cur_pickupgroup = ast_get_group(v->value); } else if (!strcasecmp(v->name, "immediate")) { immediate = ast_true(v->value); } else if (!strcasecmp(v->name, "transfertobusy")) {