aboutsummaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authormmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b>2007-10-18 17:38:26 +0000
committermmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b>2007-10-18 17:38:26 +0000
commit427f02f34813cc8d3f51e0dc42f7532099aca7f1 (patch)
treea339cbbfde0d908ab6f8a3240ad7f3b0632c12e9 /apps
parenta0de9049cbb2669cb72dd156c76a70385c86aa11 (diff)
If a non-existent file is specified to be played either as a periodic announcement
or as a hold/position announcement, the caller would be kicked out of the queue. No longer does this happen. git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@86328 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
-rw-r--r--apps/app_queue.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/app_queue.c b/apps/app_queue.c
index 7a5ba8f36..95a98df68 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -1546,7 +1546,7 @@ posout:
res = play_file(qe->chan, qe->parent->sound_thanks);
playout:
- if (res > 0 && !valid_exit(qe, res))
+ if ((res > 0 && !valid_exit(qe, res)) || res < 0)
res = 0;
/* Set our last_pos indicators */
@@ -1979,7 +1979,7 @@ static int say_periodic_announcement(struct queue_ent *qe)
/* play the announcement */
res = play_file(qe->chan, qe->parent->sound_periodicannounce[qe->last_periodic_announce_sound]);
- if (res > 0 && !valid_exit(qe, res))
+ if ((res > 0 && !valid_exit(qe, res)) || res < 0)
res = 0;
/* Resume Music on Hold if the caller is going to stay in the queue */