diff options
| author | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-04-15 16:18:38 +0000 |
|---|---|---|
| committer | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-04-15 16:18:38 +0000 |
| commit | 33de15d8f6cd80e52485d2d8c2d6bde8456c6e7c (patch) | |
| tree | e8cac353a961c34dbcdff9e65cdee2c8e3c52579 /apps/app_queue.c | |
| parent | fedf09beb7eccdf3fae03b33efada8915796d8d8 (diff) | |
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/trunk@114134 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_queue.c')
| -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 aef06aa2d..9842111c8 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -939,7 +939,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; @@ -1532,7 +1531,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. |