diff options
| author | Joshua Colp <jcolp@digium.com> | 2007-01-16 05:56:42 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2007-01-16 05:56:42 +0000 |
| commit | bf5c607c6992359b00892e46156c3ea57cdae54a (patch) | |
| tree | 731040ace49a0ca1264212435b093004ef4e9ad7 /channels | |
| parent | b7ebcec30034548fc665e60ab7e69a71e2544db5 (diff) | |
Merged revisions 51087 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r51087 | file | 2007-01-16 00:55:23 -0500 (Tue, 16 Jan 2007) | 10 lines
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: https://origsvn.digium.com/svn/asterisk/trunk@51090 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
| -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 444629484..def6c1a59 100644 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -11909,9 +11909,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")) { |