Fixes an issue where valid DTMF had to be pressed twice to exit a queue if a member...

was ringing.

(closes issue #10655, reported by strider2k, patched by me)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@81713 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_queue.c b/apps/app_queue.c
index 68f7203ca98267bb24943c3f9ab0fea86d8290e0..b1de2214625c330f6c743ef77a873a45e68dfe27 100644 (file)
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -2507,11 +2507,10 @@ static int try_calling(struct queue_ent *qe, const char *options, char *announce
                        /* Must gotten hung up */
                        res = -1;
                } else {
+                       /* User exited by pressing a digit */
                        res = digit;
-                       if (res > 0 && !valid_exit(qe, res))
-                               res = 0;
                }
-               if (option_debug)
+               if (option_debug && res == -1)
                        ast_log(LOG_DEBUG, "%s: Nobody answered.\n", qe->chan->name);
        } else { /* peer is valid */
                /* Ah ha!  Someone answered within the desired timeframe.  Of course after this