[svn-commits] mmichelson: branch mmichelson/digit_manipulation r197187 - /team/mmichelson/d...

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Wed May 27 12:48:42 2009
New Revision: 197187

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=197187
Log:
Remove an unnecessary if. This allows transfers of unbridged calls to have
the correct connected line information and run any necessary macros.


Modified:
    team/mmichelson/digit_manipulation/channels/chan_sip.c

Modified: team/mmichelson/digit_manipulation/channels/chan_sip.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/mmichelson/digit_manipulation/channels/chan_sip.c?view=diff&rev=197187&r1=197186&r2=197187
==============================================================================
--- team/mmichelson/digit_manipulation/channels/chan_sip.c (original)
+++ team/mmichelson/digit_manipulation/channels/chan_sip.c Wed May 27 12:48:42 2009
@@ -20457,18 +20457,16 @@
 
 		ast_party_connected_line_init(&connected_caller);
 		if (target.chan2) {
-			if (current->chan2) {
-				/* Tell each of the other channels to whom they are now connected */
-				/* XXX locking will need to be re-worked here since this is deadlock-prone.*/
-				ast_channel_lock(target.chan1);
-				/* If the channel thread already did the masquerade, then we don't need to do anything */
-				if (target.chan1->masq) {
-					ast_do_masquerade(target.chan1);
-				}
-				ast_channel_unlock(target.chan1);
-				ast_channel_queue_connected_line_update(target.chan1, &connected_to_transferee);
-				ast_channel_queue_connected_line_update(target.chan2, &connected_to_target);
+			/* Tell each of the other channels to whom they are now connected */
+			/* XXX locking will need to be re-worked here since this is deadlock-prone.*/
+			ast_channel_lock(target.chan1);
+			/* If the channel thread already did the masquerade, then we don't need to do anything */
+			if (target.chan1->masq) {
+				ast_do_masquerade(target.chan1);
 			}
+			ast_channel_unlock(target.chan1);
+			ast_channel_queue_connected_line_update(target.chan1, &connected_to_transferee);
+			ast_channel_queue_connected_line_update(target.chan2, &connected_to_target);
 		} else {
 			/* Notify the first other party that they are connected to someone else assuming that target.chan1
 			   has progressed far enough through the dialplan to have its called party information set. */