]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merged revisions 232356 via svnmerge from
authorJoshua Colp <jcolp@digium.com>
Wed, 2 Dec 2009 17:08:55 +0000 (17:08 +0000)
committerJoshua Colp <jcolp@digium.com>
Wed, 2 Dec 2009 17:08:55 +0000 (17:08 +0000)
https://origsvn.digium.com/svn/asterisk/trunk

................
  r232356 | file | 2009-12-02 13:06:54 -0400 (Wed, 02 Dec 2009) | 12 lines

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

  ........
    r232355 | file | 2009-12-02 13:04:52 -0400 (Wed, 02 Dec 2009) | 5 lines

    Fix a bug where if you hung up very quickly after calling AMD it would overwrite the AMDSTATUS of HANGUP with TOOLONG.

    (closes issue #16239)
    Reported by: CGMChris
  ........
................

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

apps/app_amd.c

index cb867ba35fff544d0f510ee5cb14e82ed2f87e30..7f180979ef4746b2efc2539fb0f65d8bb204c838 100644 (file)
@@ -217,6 +217,7 @@ static void isAnsweringMachine(struct ast_channel *chan, void *data)
                        ast_verb(3, "AMD: Channel [%s]. HANGUP\n", chan->name);
                        ast_debug(1, "Got hangup\n");
                        strcpy(amdStatus, "HANGUP");
+                       res = 1;
                        break;
                }