From: Joshua Colp <jcolp@digium.com>
Date: Wed, 24 May 2017 18:04:16 +0000 (-0500)
Subject: Merge "app_queue: Add QUEUE_RAISE_PENALTY feature"
X-Git-Tag: 15.0.0-beta1~126
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2e7866ebb7773fdd4f67e80f3747e41d84bcb93b;p=thirdparty%2Fasterisk.git

Merge "app_queue: Add QUEUE_RAISE_PENALTY feature"
---

2e7866ebb7773fdd4f67e80f3747e41d84bcb93b
diff --cc apps/app_queue.c
index 0e0b80108e,41014ed500..f158a4caa8
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@@ -5460,11 -5521,10 +5519,11 @@@ static int wait_our_turn(struct queue_e
  		if (qe->parent->leavewhenempty) {
  			int status = 0;
  
- 			if ((status = get_member_status(qe->parent, qe->max_penalty, qe->min_penalty, qe->parent->leavewhenempty, 0))) {
+ 			if ((status = get_member_status(qe->parent, qe->max_penalty, qe->min_penalty, qe->raise_penalty, qe->parent->leavewhenempty, 0))) {
  				*reason = QUEUE_LEAVEEMPTY;
  				ast_queue_log(qe->parent->name, ast_channel_uniqueid(qe->chan), "NONE", "EXITEMPTY", "%d|%d|%ld", qe->pos, qe->opos, (long) (time(NULL) - qe->start));
 -				leave_queue(qe);
 +				res = -1;
 +				qe->handled = -1;
  				break;
  			}
  		}