[asterisk-commits] russell: branch 1.6.0 r114549 - in /branches/1.6.0: ./ main/channel.c

[SVN commits to the Asterisk project]

Author: russell
Date: Tue Apr 22 15:27:09 2008
New Revision: 114549

URL: http://svn.digium.com/view/asterisk?view=rev&rev=114549
Log:
Merged revisions 114548 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r114548 | russell | 2008-04-22 15:25:56 -0500 (Tue, 22 Apr 2008) | 2 lines

re-add a fix that got lost with a recent change

........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/channel.c

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

Modified: branches/1.6.0/main/channel.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/channel.c?view=diff&rev=114549&r1=114548&r2=114549
==============================================================================
--- branches/1.6.0/main/channel.c (original)
+++ branches/1.6.0/main/channel.c Tue Apr 22 15:27:09 2008
@@ -2287,7 +2287,7 @@
 		 * avoidance not to work in deeper functions
 		 */
 		ast_channel_unlock(chan);
-		res = generate(chan, tmp, f->datalen, f->samples);
+		res = generate(chan, tmp, f->datalen, samples);
 		ast_channel_lock(chan);
 		chan->generatordata = tmp;
 		if (res) {