[svn-commits] file: trunk r60763 - in /trunk: ./ apps/app_queue.c

[svn-commits at lists.digium.com]

Author: file
Date: Sun Apr  8 12:13:39 2007
New Revision: 60763

URL: http://svn.digium.com/view/asterisk?view=rev&rev=60763
Log:
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)

........

Modified:
    trunk/   (props changed)
    trunk/apps/app_queue.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_queue.c?view=diff&rev=60763&r1=60762&r2=60763
==============================================================================
--- trunk/apps/app_queue.c (original)
+++ trunk/apps/app_queue.c Sun Apr  8 12:13:39 2007
@@ -2668,7 +2668,7 @@
 				}
 
 				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);