From: Russell Bryant <russell@russellbryant.com>
Date: Fri, 2 Mar 2007 00:22:22 +0000 (+0000)
Subject: Merged revisions 57396 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~3077
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=98024262191fb12b3f478472af328d6100e8a40b;p=thirdparty%2Fasterisk.git

Merged revisions 57396 via svnmerge from
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
---

diff --git a/main/file.c b/main/file.c
index 9315f225b0..c259d5a323 100644
--- a/main/file.c
+++ b/main/file.c
@@ -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;
 					}