From: Joshua Colp <jcolp@digium.com>
Date: Wed, 2 Dec 2009 17:10:13 +0000 (+0000)
Subject: Merged revisions 232356 via svnmerge from
X-Git-Tag: 1.6.1.12-rc1~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c971bf6a67ad91faae37f2b747ce7a1719294962;p=thirdparty%2Fasterisk.git

Merged revisions 232356 via svnmerge from
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.1@232358 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_amd.c b/apps/app_amd.c
index 131cd01fd2..5a52f81579 100644
--- a/apps/app_amd.c
+++ b/apps/app_amd.c
@@ -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;
 		}