From: Joshua Colp <jcolp@digium.com>
Date: Sun, 8 Apr 2007 17:13:39 +0000 (+0000)
Subject: Merged revisions 60762 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~2887
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ab4327d8bff79acd01a010597e0cce5c1f754c8;p=thirdparty%2Fasterisk.git

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
---

diff --git a/apps/app_queue.c b/apps/app_queue.c
index 578da29b86..5231e291c9 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);