From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Wed, 30 Dec 2009 22:00:26 +0000 (+0000)
Subject: Merged revisions 236982 via svnmerge from
X-Git-Tag: 1.6.0.21-rc1~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f144b8f30d3f412867867af1611ea7d2cb877117;p=thirdparty%2Fasterisk.git

Merged revisions 236982 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r236982 | tilghman | 2009-12-30 15:59:18 -0600 (Wed, 30 Dec 2009) | 16 lines

  Merged revisions 236981 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r236981 | tilghman | 2009-12-30 15:57:10 -0600 (Wed, 30 Dec 2009) | 9 lines

    Don't queue frames to channels that have no means to process them.
    (closes issue #15609)
     Reported by: aragon
     Patches:
           20091230__issue16521__1.4__chan_local_only.diff.txt uploaded by tilghman (license 14)
     Tested by: aragon

    Review: https://reviewboard.asterisk.org/r/452/
  ........
................


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

diff --git a/channels/chan_local.c b/channels/chan_local.c
index 7c8aa8d759..1c0a89c09d 100644
--- a/channels/chan_local.c
+++ b/channels/chan_local.c
@@ -217,7 +217,9 @@ static int local_queue_frame(struct local_pvt *p, int isoutbound, struct ast_fra
 	}
 
 	if (other) {
-		ast_queue_frame(other, f);
+		if (other->pbx || other->_bridge) {
+			ast_queue_frame(other, f);
+		} /* else the frame won't go anywhere */
 		ast_channel_unlock(other);
 	}