diff options
| author | bweschke <bweschke@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-05-08 12:30:46 +0000 |
|---|---|---|
| committer | bweschke <bweschke@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-05-08 12:30:46 +0000 |
| commit | fd6e0fdfcbe89e6ae1b122d220a74f6409bcb96e (patch) | |
| tree | 136f95ea5a3ded3d6c188153613cf2e4273645f6 /apps/app_queue.c | |
| parent | bb7e5c2fa8b7a4385c5918f0b852b735a31c58c1 (diff) | |
Fix situation for when there is no monitor_option defined, but there is a monitor_exec defined.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@25487 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_queue.c')
| -rw-r--r-- | apps/app_queue.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/apps/app_queue.c b/apps/app_queue.c index 4e960d2cb..4f5d3e33c 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); |