[svn-commits] alecdavis: branch 1.6.1 r234862 - in /branches/1.6.1: ./ apps/app_directory.c

[SVN commits to the Digium repositories]

Author: alecdavis
Date: Mon Dec 14 19:18:42 2009
New Revision: 234862

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=234862
Log:
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)
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/apps/app_directory.c

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

Modified: branches/1.6.1/apps/app_directory.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/apps/app_directory.c?view=diff&rev=234862&r1=234861&r2=234862
==============================================================================
--- branches/1.6.1/apps/app_directory.c (original)
+++ branches/1.6.1/apps/app_directory.c Mon Dec 14 19:18:42 2009
@@ -740,7 +740,7 @@
 					"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);