aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b>2010-02-18 20:59:38 +0000
committerdvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b>2010-02-18 20:59:38 +0000
commit3b8c09df6a428ea9ed13adf0b24cf82a479fa2a2 (patch)
tree21f6334d1fe1f8ec7febb87081eeb4e18251143d
parentf02a12689cd1d5bdf6ca39bb8c9bd7bdd093cc43 (diff)
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: http://svn.digium.com/svn/asterisk/branches/1.6.2@247737 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--apps/app_queue.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/app_queue.c b/apps/app_queue.c
index 0ab4b969f..54573599f 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);