From: Jason Parker <jparker@digium.com>
Date: Fri, 20 Apr 2007 19:54:54 +0000 (+0000)
Subject: Merged revisions 61694 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~2825
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=52ae7d58f7a6bb6569aec00f7ad8c1adfcdcd8c1;p=thirdparty%2Fasterisk.git

Merged revisions 61694 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r61694 | qwell | 2007-04-20 14:51:49 -0500 (Fri, 20 Apr 2007) | 13 lines

Merged revisions 61692 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r61692 | qwell | 2007-04-20 14:49:54 -0500 (Fri, 20 Apr 2007) | 5 lines

If the '* to hangup' option is not enabled, we don't need to disable * as a valid exit key.
  If it was enabled, this statement would've never been checked in the first place.

Issue #9552

........

................


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

diff --git a/apps/app_queue.c b/apps/app_queue.c
index 5286f327c4..ad0f243e9b 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -2122,7 +2122,7 @@ static struct callattempt *wait_for_answer(struct queue_ent *qe, struct callatte
 				ast_frfree(f);
 				return NULL;
 			}
-			if ((f->frametype == AST_FRAME_DTMF) && (f->subclass != '*') && valid_exit(qe, f->subclass)) {
+			if ((f->frametype == AST_FRAME_DTMF) && valid_exit(qe, f->subclass)) {
 				if (option_verbose > 3)
 					ast_verbose(VERBOSE_PREFIX_3 "User pressed digit: %c\n", f->subclass);
 				*to = 0;