don't allow call waiting during the initial ringing (issue #5188)

git-svn-id: http://svn.digium.com/svn/asterisk/branches/v1-0@6569 f38db490-d61c-443f-a65b-d21fe96a405b

2 files changed, 4 insertions, 1 deletions

diff --git a/CHANGES b/CHANGES
index ed2e926a8..381d68371 100755
--- a/CHANGES
+++ b/CHANGES
@@ -11,6 +11,9 @@
        only, not requiring authentication on incoming invites, or both. Before,
        to not require authentication on incoming invites also required matching
        peers based on IP only.
+ -- chan_zap
+    -- Before, call waiting could occur during the initial ringing on the line.
+       This has now been fixed.
  -- app_disa
     -- We will now not set the accountcode if one is not supplied. 
  -- app_meetme
diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index a90dab2d8..943d488c6 100755
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -6710,7 +6710,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;
 	}