[asterisk-commits] trunk r25487 - /trunk/apps/app_queue.c

[asterisk-commits at lists.digium.com]

Author: bweschke
Date: Mon May  8 07:30:46 2006
New Revision: 25487

URL: http://svn.digium.com/view/asterisk?rev=25487&view=rev
Log:
 Fix situation for when there is no monitor_option defined, but there is a monitor_exec defined.


Modified:
    trunk/apps/app_queue.c

Modified: trunk/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_queue.c?rev=25487&r1=25486&r2=25487&view=diff
==============================================================================
--- trunk/apps/app_queue.c (original)
+++ trunk/apps/app_queue.c Mon May  8 07:30:46 2006
@@ -2365,13 +2365,14 @@
 					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)) 
+					else 
 						snprintf(mixmonargs, sizeof(mixmonargs)-1, "%s|b%s", tmpid2, monitor_options);
-					else 
-						snprintf(mixmonargs, sizeof(mixmonargs)-1, "%s|b", tmpid2);
 						
 					if (option_debug)
 						ast_log(LOG_DEBUG, "Arguments being passed to MixMonitor: %s\n", mixmonargs);