From: BJ Weschke <bweschke@btwtech.com>
Date: Mon, 8 May 2006 12:30:46 +0000 (+0000)
Subject:  Fix situation for when there is no monitor_option defined, but there is a monitor_ex... 
X-Git-Tag: 1.4.0-beta1~1524
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=714aab87bb5fcf773c63ffc922454c917212c53f;p=thirdparty%2Fasterisk.git

 Fix situation for when there is no monitor_option defined, but there is a monitor_exec defined.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@25487 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_queue.c b/apps/app_queue.c
index 4e960d2cbd..4f5d3e33c3 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -2365,13 +2365,14 @@ static int try_calling(struct queue_ent *qe, const char *options, char *announce
 					mixmonapp = NULL;
 				}
 
+				if (!monitor_options)
+					monitor_options = ast_strdupa("");
+
 				if (mixmonapp) {
 					if (!ast_strlen_zero(monitor_exec) && !ast_strlen_zero(monitor_options)) 
 						snprintf(mixmonargs, sizeof(mixmonargs)-1, "%s|b%s|%s", tmpid2, monitor_options, monitor_exec);
-					else if (!ast_strlen_zero(monitor_options)) 
-						snprintf(mixmonargs, sizeof(mixmonargs)-1, "%s|b%s", tmpid2, monitor_options);
 					else 
-						snprintf(mixmonargs, sizeof(mixmonargs)-1, "%s|b", tmpid2);
+						snprintf(mixmonargs, sizeof(mixmonargs)-1, "%s|b%s", tmpid2, monitor_options);
 						
 					if (option_debug)
 						ast_log(LOG_DEBUG, "Arguments being passed to MixMonitor: %s\n", mixmonargs);