Merged revisions 57396 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Fri, 2 Mar 2007 00:22:22 +0000 (00:22 +0000)
committerRussell Bryant <russell@russellbryant.com>
Fri, 2 Mar 2007 00:22:22 +0000 (00:22 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r57396 | russell | 2007-03-01 18:20:44 -0600 (Thu, 01 Mar 2007) | 4 lines

Return the correct digit that interrupted the stream.  This fixes exiting the
Background application when using the m option.
(issue #9176, mjagdis)

........

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

main/file.c

index 9315f22..c259d5a 100644 (file)
@@ -1021,6 +1021,7 @@ static int waitstream_core(struct ast_channel *c, const char *breakon,
                                if (context) {
                                        const char exten[2] = { fr->subclass, '\0' };
                                        if (ast_exists_extension(c, context, exten, 1, c->cid.cid_num)) {
+                                               res = fr->subclass;
                                                ast_frfree(fr);
                                                return res;
                                        }