diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-01-16 05:55:23 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-01-16 05:55:23 +0000 |
| commit | ffe08001a6c0cf68d8a31a33b6bd0c1880037401 (patch) | |
| tree | 649e20535eb66d4e28e7294e663a78db470bc200 /channels/chan_zap.c | |
| parent | c6a4c50e851f4ab23bebcad1b5237b2946c83e33 (diff) | |
Merged revisions 51085 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r51085 | file | 2007-01-16 00:53:31 -0500 (Tue, 16 Jan 2007) | 2 lines
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.4@51087 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 f3d9359ce..0208f54f0 100644 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -10603,9 +10603,15 @@ static int process_zap(struct ast_variable *v, int reload, int skipchannels) } 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")) { |