From: Automerge Script <automerge@asterisk.org>
Date: Tue, 16 Jan 2007 06:09:57 +0000 (+0000)
Subject: automerge commit
X-Git-Tag: 1.2.15-netsec~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ab1111631a8789c91d8f561616e1680f5648348c;p=thirdparty%2Fasterisk.git

automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@51118 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

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")) {