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: https://origsvn.digium.com/svn/asterisk/branches/1.4@86328 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_queue.c b/apps/app_queue.c
index 7a5ba8f36ba33cf12a611fc405d22f208ac2b065..95a98df68a60dd165b22984eaa50125cc3ad47a1 100644 (file)
--- 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 */