[svn-commits] rmudgett: trunk r348408 - in /trunk: ./ main/channel.c

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Fri Dec 16 15:30:35 2011
New Revision: 348408

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=348408
Log:
Fix cut and past error in ast_call_forward().

(issue ASTERISK-18836)
........

Merged revisions 348401 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 348405 from http://svn.asterisk.org/svn/asterisk/branches/10

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

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

Modified: trunk/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/channel.c?view=diff&rev=348408&r1=348407&r2=348408
==============================================================================
--- trunk/main/channel.c (original)
+++ trunk/main/channel.c Fri Dec 16 15:30:35 2011
@@ -5437,7 +5437,7 @@
 		if (oh->account) {
 			ast_channel_lock(new);
 			ast_cdr_setaccount(new, oh->account);
-			ast_channel_lock(new);
+			ast_channel_unlock(new);
 		}
 	} else if (caller) { /* no outgoing helper so use caller if avaliable */
 		ast_channel_update_redirecting(caller, apr, NULL);