diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-01-16 05:53:31 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-01-16 05:53:31 +0000 |
| commit | 7b99d13e894d33a935bb539f08c88aff10c68d96 (patch) | |
| tree | b19f0e5f8a51beeae8624533b3c7d1998cb9f16f /channels/chan_zap.c | |
| parent | af8e3068d509d0705c0e6b833dcea00aeaf2a831 (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.2@51085 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_zap.c')
| -rw-r--r-- | channels/chan_zap.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/channels/chan_zap.c b/channels/chan_zap.c index 277a152c1..73cc62741 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")) { |