From: Richard Mudgett <rmudgett@digium.com>
Date: Tue, 8 Jan 2013 23:55:57 +0000 (+0000)
Subject: app_queue: Fix incorrect assertion.
X-Git-Tag: 10.12.0-rc2~3^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b5e276058380d3a6d92286c02de3fbd7e45bbf7c;p=thirdparty%2Fasterisk.git

app_queue: Fix incorrect assertion.

(issue ASTERISK-16115)


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

diff --git a/apps/app_queue.c b/apps/app_queue.c
index c2b1bf3478..590f5e1294 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -3270,7 +3270,7 @@ static int ring_entry(struct queue_ent *qe, struct callattempt *tmp, int *busies
 		++*busies;
 		return 0;
 	}
-	ast_assert(qe->parent->ringinuse || tmp->member->call_pending);
+	ast_assert((qe->parent->ringinuse && tmp->member->ignorebusy) || tmp->member->call_pending);
 
 	ast_copy_string(tech, tmp->interface, sizeof(tech));
 	if ((location = strchr(tech, '/')))