From: Automerge script <automerge@asterisk.org>
Date: Tue, 30 Oct 2012 02:22:01 +0000 (+0000)
Subject: Merged revisions 375451 via svnmerge from
X-Git-Tag: 10.11.0-digiumphones-rc1~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b7ea4e0c78e71a4e0bcbcf4810b81d476ab87667;p=thirdparty%2Fasterisk.git

Merged revisions 375451 via svnmerge from
file:///srv/subversion/repos/asterisk/branches/10

................
  r375451 | mjordan | 2012-10-29 21:14:01 -0500 (Mon, 29 Oct 2012) | 14 lines

  Ensure that the Queue application tracks busy members in off nominal situations

  There are a few code paths where the Queue application fails to count a paused
  or in use queue member as being 'busy'.  This can cause callers to get stuck
  in the Queue until a paused agent unpauses themselves.

  (closes issue ASTERISK-20623)
  Reported by: Bryan Walters
  patches:
    app_queue.patch uploaded by Bryan Walters (license 5851)
  ........

  Merged revisions 375450 from http://svn.asterisk.org/svn/asterisk/branches/1.8
................


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

diff --git a/apps/app_queue.c b/apps/app_queue.c
index 916d7c5824..15c1a65755 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -3170,6 +3170,7 @@ static int ring_entry(struct queue_ent *qe, struct callattempt *tmp, int *busies
 			ast_cdr_busy(qe->chan->cdr);
 		}
 		tmp->stillgoing = 0;
+		(*busies)++;
 		return 0;
 	}
 
@@ -3200,6 +3201,7 @@ static int ring_entry(struct queue_ent *qe, struct callattempt *tmp, int *busies
 				ast_cdr_busy(qe->chan->cdr);
 			}
 			tmp->stillgoing = 0;
+			(*busies)++;
 			return 0;
 		}
 	}