[svn-commits] rmudgett: branch 10 r331772 - in /branches/10: ./ channels/chan_dahdi.c

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Fri Aug 12 13:59:45 2011
New Revision: 331772

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=331772
Log:
Merged revisions 331771 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r331771 | rmudgett | 2011-08-12 13:58:40 -0500 (Fri, 12 Aug 2011) | 8 lines
  
  Suppress warning message when using DAHDITransfer or DAHDIHangup.
  
  * The fake event should only be processed by the channel that currently
  owns the private and not the associated call waiting or 3-way channel.
  
  JIRA AST-620
  JIRA SWP-3616
........

Modified:
    branches/10/   (props changed)
    branches/10/channels/chan_dahdi.c

Propchange: branches/10/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: branches/10/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/branches/10/channels/chan_dahdi.c?view=diff&rev=331772&r1=331771&r2=331772
==============================================================================
--- branches/10/channels/chan_dahdi.c (original)
+++ branches/10/channels/chan_dahdi.c Fri Aug 12 13:59:45 2011
@@ -9010,8 +9010,11 @@
 		return &p->subs[idx].f;
 	}
 
-	/* If we have a fake_event, fake an exception to handle it */
-	if (p->fake_event) {
+	/*
+	 * If we have a fake_event, fake an exception to handle it only
+	 * if this channel owns the private.
+	 */
+	if (p->fake_event && p->owner == ast) {
 		if (analog_lib_handles(p->sig, p->radio, p->oprmode)) {
 			struct analog_pvt *analog_p = p->sig_pvt;