From: Alec L Davis <sivad.a@paradise.net.nz>
Date: Tue, 15 Dec 2009 01:18:42 +0000 (+0000)
Subject: Merged revisions 234855 via svnmerge from
X-Git-Tag: 1.6.1.13-rc1~56
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb12ed99ca2dbf20df024a6cabccbb2194a4108e;p=thirdparty%2Fasterisk.git

Merged revisions 234855 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r234855 | alecdavis | 2009-12-15 13:54:44 +1300 (Tue, 15 Dec 2009) | 9 lines

  ast_stream_and_wait(chan,dir-usingkeypad) didn't capture the dialled DTMF.

    (closes issue #16409)
    Reported by: alecdavis
    Tested by: alecdavis
    Patch
  	bug_16409.diff.txt uploaded by alecdavis (license 585)
........


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

diff --git a/apps/app_directory.c b/apps/app_directory.c
index fad117f492..9e51bf2d47 100644
--- a/apps/app_directory.c
+++ b/apps/app_directory.c
@@ -740,7 +740,7 @@ static int directory_exec(struct ast_channel *chan, void *data)
 					"dir-firstlast", AST_DIGIT_ANY);
 			}
 			if (!res) {
-				ast_stream_and_wait(chan, "dir-usingkeypad", AST_DIGIT_ANY);
+				res = ast_stream_and_wait(chan, "dir-usingkeypad", AST_DIGIT_ANY);
 			}
 		}
 		ast_stopstream(chan);