[asterisk-commits] tilghman: branch 1.6.1 r189913 - in /branches/1.6.1: ./ channels/chan_unistim.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Wed Apr 22 11:03:07 2009
New Revision: 189913

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=189913
Log:
Merged revisions 189911 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r189911 | tilghman | 2009-04-22 11:01:30 -0500 (Wed, 22 Apr 2009) | 7 lines
  
  Do not continue to receive DTMF, when the channel is hungup and about to be destroyed.
  (closes issue #14858)
   Reported by: barryf
   Patches: 
         20090421__bug14858.diff.txt uploaded by tilghman (license 14)
   Tested by: barryf
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/channels/chan_unistim.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/channels/chan_unistim.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.1/channels/chan_unistim.c?view=diff&rev=189913&r1=189912&r2=189913
==============================================================================
--- branches/1.6.1/channels/chan_unistim.c (original)
+++ branches/1.6.1/channels/chan_unistim.c Wed Apr 22 11:03:07 2009
@@ -2474,7 +2474,7 @@
 	struct ast_frame f = { 0, };
 	struct unistim_subchannel *sub;
 	sub = pte->device->lines->subs[SUB_REAL];
-	if (!sub->owner) {
+	if (!sub->owner || sub->alreadygone) {
 		ast_log(LOG_WARNING, "Unable to find subchannel in dtmf senddigit\n");
 		return -1;
 	}
@@ -4224,8 +4224,8 @@
 
 	sub = pte->device->lines->subs[SUB_REAL];
 
-	if (!sub->owner) {
-		ast_log(LOG_WARNING, "Unable to find subchannel in dtmf senddigiti_end\n");
+	if (!sub->owner || sub->alreadygone) {
+		ast_log(LOG_WARNING, "Unable to find subchannel in dtmf senddigit_end\n");
 		return -1;
 	}