[asterisk-commits] file: branch 1.2 r51085 - /branches/1.2/channels/chan_zap.c

[asterisk-commits at lists.digium.com]

Author: file
Date: Mon Jan 15 23:53:31 2007
New Revision: 51085

URL: http://svn.digium.com/view/asterisk?view=rev&rev=51085
Log:
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)

Modified:
    branches/1.2/channels/chan_zap.c

Modified: branches/1.2/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/branches/1.2/channels/chan_zap.c?view=diff&rev=51085&r1=51084&r2=51085
==============================================================================
--- branches/1.2/channels/chan_zap.c (original)
+++ branches/1.2/channels/chan_zap.c Mon Jan 15 23:53:31 2007
@@ -10440,9 +10440,15 @@
 		} 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")) {