Merged revisions 281723 via svnmerge from
authorTilghman Lesher <tilghman@meg.abyt.es>
Wed, 11 Aug 2010 15:20:29 +0000 (15:20 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Wed, 11 Aug 2010 15:20:29 +0000 (15:20 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r281723 | tilghman | 2010-08-11 10:18:40 -0500 (Wed, 11 Aug 2010) | 14 lines

  Merged revisions 281722 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ........
    r281722 | tilghman | 2010-08-11 10:17:20 -0500 (Wed, 11 Aug 2010) | 7 lines

    Only set status TIMEOUT, if we have no digits.

    (closes issue #15188)
     Reported by: jcovert
     Patches:
           app_readexten.c.patch-1.6.2.8-rc1 uploaded by jcovert (license 551)
  ........
................

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

apps/app_readexten.c

index 8049fc9..5e8159b 100644 (file)
@@ -232,7 +232,7 @@ static int readexten_exec(struct ast_channel *chan, const char *data)
                        if (res < 1) {          /* timeout expired or hangup */
                                if (ast_check_hangup(chan)) {
                                        status = "HANGUP";
-                               } else {
+                               } else if (x == 0) {
                                        pbx_builtin_setvar_helper(chan, arglist.variable, "t");
                                        status = "TIMEOUT";
                                }