Merged revisions 378689 via svnmerge from

file:///srv/subversion/repos/asterisk/branches/10

........
  r378689 | rmudgett | 2013-01-08 17:55:57 -0600 (Tue, 08 Jan 2013) | 4 lines

  app_queue: Fix incorrect assertion.

  (issue ASTERISK-16115)
........

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

diff --git a/apps/app_queue.c b/apps/app_queue.c
index 7eaa0b237189388327ca42248e249ab0ea50a640..a33840b5e4f7b5a656ff38addf6f4ce2405edac4 100644 (file)
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -3276,7 +3276,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, '/')))