From: David Vossel <dvossel@digium.com>
Date: Thu, 18 Feb 2010 20:59:38 +0000 (+0000)
Subject: Merged revisions 247736 via svnmerge from
X-Git-Tag: 1.6.2.6-rc1~46
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6a85387927c95eb30e0b65c0189c489933768490;p=thirdparty%2Fasterisk.git

Merged revisions 247736 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r247736 | dvossel | 2010-02-18 14:58:41 -0600 (Thu, 18 Feb 2010) | 7 lines

  fixes Queue with C option crash

  (closes issue #16475)
  Reported by: okrief
  Patches:
        queue_crash.diff uploaded by dvossel (license 671)
........


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

diff --git a/apps/app_queue.c b/apps/app_queue.c
index 0ab4b969f6..54573599f3 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -2304,7 +2304,7 @@ static void hangupcalls(struct callattempt *outgoing, struct ast_channel *except
 	while (outgoing) {
 		/* If someone else answered the call we should indicate this in the CANCEL */
 		/* Hangup any existing lines we have open */
-		if (outgoing->chan && (outgoing->chan != exception || cancel_answered_elsewhere)) {
+		if (outgoing->chan && (outgoing->chan != exception)) {
 			if (exception || cancel_answered_elsewhere)
 				ast_set_flag(outgoing->chan, AST_FLAG_ANSWERED_ELSEWHERE);
 			ast_hangup(outgoing->chan);