]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merged revisions 189911 via svnmerge from
authorTilghman Lesher <tilghman@meg.abyt.es>
Wed, 22 Apr 2009 16:03:07 +0000 (16:03 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Wed, 22 Apr 2009 16:03:07 +0000 (16:03 +0000)
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
........

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

channels/chan_unistim.c

index 0354b7af861a775e2331a6362cfc9c1e7fb7c37f..52102af9492239aebd9f56808d8617ccac8386f6 100644 (file)
@@ -2474,7 +2474,7 @@ static int unistim_do_senddigit(struct unistimsession *pte, char digit)
        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 @@ static int unistim_senddigit_end(struct ast_channel *ast, char digit, unsigned i
 
        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;
        }