[asterisk-commits] jrose: trunk r403958 - in /trunk: ./ main/bridge.c

[SVN commits to the Asterisk project]

Author: jrose
Date: Mon Dec 16 12:31:12 2013
New Revision: 403958

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=403958
Log:
transfers: Fix bug setting both BLINDTRANSFER and ATTENDEDTRANSFER

The ast_bridge_set_transfer_variables function is supposed to wipe whichever
variable isn't being set. Instead it was setting both to the new value.  Oops.

(issue AFS-24)
........

Merged revisions 403957 from http://svn.asterisk.org/svn/asterisk/branches/12

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

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

Modified: trunk/main/bridge.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/bridge.c?view=diff&rev=403958&r1=403957&r2=403958
==============================================================================
--- trunk/main/bridge.c (original)
+++ trunk/main/bridge.c Mon Dec 16 12:31:12 2013
@@ -3969,7 +3969,7 @@
 	}
 
 	pbx_builtin_setvar_helper(chan, writevar, value);
-	pbx_builtin_setvar_helper(chan, erasevar, value);
+	pbx_builtin_setvar_helper(chan, erasevar, NULL);
 }
 
 /*!