[asterisk-commits] sruffell: branch sruffell/asterisk-1.4-transcoder r166664 - /team/sruffell/as...

[SVN commits to the Asterisk project]

Author: sruffell
Date: Tue Dec 23 12:09:12 2008
New Revision: 166664

URL: http://svn.digium.com/view/asterisk?view=rev&rev=166664
Log:
Merging in patch AST-172_2.patch.  Again, this is just for testing purposes
and should not be merged into the head of the 1.4 branch when this branch is
merged in. 

Modified:
    team/sruffell/asterisk-1.4-transcoder/apps/app_queue.c

Modified: team/sruffell/asterisk-1.4-transcoder/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/team/sruffell/asterisk-1.4-transcoder/apps/app_queue.c?view=diff&rev=166664&r1=166663&r2=166664
==============================================================================
--- team/sruffell/asterisk-1.4-transcoder/apps/app_queue.c (original)
+++ team/sruffell/asterisk-1.4-transcoder/apps/app_queue.c Tue Dec 23 12:09:12 2008
@@ -2620,7 +2620,7 @@
 
 	update_queue(qe->parent, member, callcompletedinsl);
 	
-	if ((datastore = ast_channel_datastore_find(new_chan, &queue_transfer_info, NULL))) {
+	if ((datastore = ast_channel_datastore_find(old_chan, &queue_transfer_info, NULL))) {
 		ast_channel_datastore_remove(new_chan, datastore);
 	} else {
 		ast_log(LOG_WARNING, "Can't find the queue_transfer datastore.\n");
@@ -3203,7 +3203,7 @@
 			update_queue(qe->parent, member, callcompletedinsl);
 		}
 
-		if (transfer_ds) {
+		if (transfer_ds && (transfer_ds = ast_channel_datastore_find(qe->chan, &queue_transfer_info, NULL))) {
 			ast_channel_datastore_free(transfer_ds);
 		}
 		ast_hangup(peer);