[svn-commits] russell: trunk r57397 - in /trunk: ./ main/file.c

[svn-commits at lists.digium.com]

Author: russell
Date: Thu Mar  1 18:22:22 2007
New Revision: 57397

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

........

Modified:
    trunk/   (props changed)
    trunk/main/file.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/file.c
URL: http://svn.digium.com/view/asterisk/trunk/main/file.c?view=diff&rev=57397&r1=57396&r2=57397
==============================================================================
--- trunk/main/file.c (original)
+++ trunk/main/file.c Thu Mar  1 18:22:22 2007
@@ -1021,6 +1021,7 @@
 				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;
 					}