summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorJoshua Colp <jcolp@digium.com>2007-04-08 17:13:39 +0000
committerJoshua Colp <jcolp@digium.com>2007-04-08 17:13:39 +0000
commit9ab4327d8bff79acd01a010597e0cce5c1f754c8 (patch)
tree90e2f48dcbc20c8c43247b2c2d89c070abd5444b /apps
parent072347fa4093a1fb9c7a0f8b80c506cad9ccfc74 (diff)
Merged revisions 60762 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r60762 | file | 2007-04-08 13:04:44 -0400 (Sun, 08 Apr 2007) | 2 lines Allow app_queue to use MONITOR_EXEC even if MONITOR_OPTIONS is not set. (issue #9495 reported by cduffy) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@60763 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps')
-rw-r--r--apps/app_queue.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/app_queue.c b/apps/app_queue.c
index 578da29b8..5231e291c 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -2668,7 +2668,7 @@ static int try_calling(struct queue_ent *qe, const char *options, char *announce
}
if (mixmonapp) {
- if (!ast_strlen_zero(monitor_exec) && !ast_strlen_zero(monitor_options))
+ if (!ast_strlen_zero(monitor_exec))
snprintf(mixmonargs, sizeof(mixmonargs)-1, "%s|b%s|%s", tmpid2, monitor_options, monitor_exec);
else
snprintf(mixmonargs, sizeof(mixmonargs)-1, "%s|b%s", tmpid2, monitor_options);