From: Doug Bailey <dbailey@digium.com>
Date: Fri, 23 Jan 2009 16:35:30 +0000 (+0000)
Subject: MWI messages included in CID spill was not being properly handled and prevented the... 
X-Git-Tag: 1.6.2.0-beta1~381
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=de63e93a3930f986731ef10ce7f125051ac3dc3d;p=thirdparty%2Fasterisk.git

MWI messages included in CID spill was not being properly handled and prevented the call from being processed
(issue #14313)
Reported by: seandarcy
Tested by: dbailey


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

diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index 631694261b..257baff38d 100644
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -7517,16 +7517,16 @@ static void *ss_thread(void *data)
 			/* If generated using Ring Pulse Alert, then ring has been answered as a call and needs to be hungup */
 			if (p->mwimonitor_rpas) {
 				ast_hangup(chan);
+				return NULL;
 			}
-			return NULL;
 		} else if (flags & CID_NOMSGWAITING) {
 			ast_log(LOG_NOTICE, "MWI: Channel %d no message waiting!\n", p->channel);
 			notify_message(p->mailbox, 0);
 			/* If generated using Ring Pulse Alert, then ring has been answered as a call and needs to be hungup */
 			if (p->mwimonitor_rpas) {
 				ast_hangup(chan);
+				return NULL;
 			}
-			return NULL;
 		}
 
 		ast_setstate(chan, AST_STATE_RING);