From: Mark Spencer <markster@digium.com>
Date: Sun, 11 Sep 2005 17:01:10 +0000 (+0000)
Subject: Don't allow callwait to happen during initial ringdown (bug #5188)
X-Git-Tag: 1.2.0-beta2~351
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=961cd50bba9621982c6876c06d96278e514b3de2;p=thirdparty%2Fasterisk.git

Don't allow callwait to happen during initial ringdown (bug #5188)


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

diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index 2709b02d91..aae045549e 100755
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -7239,7 +7239,7 @@ static inline int available(struct zt_pvt *p, int channelmatch, int groupmatch,
 	}
 	
 	if ((p->owner->_state != AST_STATE_UP) &&
-		(p->owner->_state != AST_STATE_RINGING)) {
+		((p->owner->_state != AST_STATE_RINGING) || p->outgoing)) {
 		/* If the current call is not up, then don't allow the call */
 		return 0;
 	}