diff options
| author | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-04-15 16:19:06 +0000 |
|---|---|---|
| committer | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-04-15 16:19:06 +0000 |
| commit | 89b74a249267239cbebdd216e1f7dbf07b2014f7 (patch) | |
| tree | 1a84e330bb8d68ef391ccac9a249e41b13b94ca4 /apps | |
| parent | d848d08036044038c246ae953c77831a54453cc9 (diff) | |
Merged revisions 114134 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r114134 | qwell | 2008-04-15 11:18:38 -0500 (Tue, 15 Apr 2008) | 16 lines
Merged revisions 114133 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r114133 | qwell | 2008-04-15 11:18:08 -0500 (Tue, 15 Apr 2008) | 8 lines
Allow autofill to work in the general section of queues.conf.
Additionally, don't try to (re)set options when they have empty values in realtime (all unset columns would have an empty value).
(closes issue #12445)
Reported by: atis
Patches:
12445-autofill.diff uploaded by qwell (license 4)
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@114135 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_queue.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/apps/app_queue.c b/apps/app_queue.c index ca1e05c16..f77554b69 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -938,7 +938,6 @@ static void init_queue(struct call_queue *q) q->monfmt[0] = '\0'; q->reportholdtime = 0; q->wrapuptime = 0; - q->autofill = 0; q->joinempty = 0; q->leavewhenempty = 0; q->memberdelay = 0; @@ -1525,7 +1524,11 @@ static struct call_queue *find_queue_by_name_rt(const char *queuename, struct as *tmp++ = '-'; } else tmp_name = v->name; - queue_set_param(q, tmp_name, v->value, -1, 0); + + if (!ast_strlen_zero(v->value)) { + /* Don't want to try to set the option if the value is empty */ + queue_set_param(q, tmp_name, v->value, -1, 0); + } } /* Temporarily set realtime members dead so we can detect deleted ones. |