[asterisk-commits] file: trunk r79403 - in /trunk: ./ res/res_features.c

[SVN commits to the Asterisk project]

Author: file
Date: Tue Aug 14 10:30:03 2007
New Revision: 79403

URL: http://svn.digium.com/view/asterisk?view=rev&rev=79403
Log:
Merged revisions 79397 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r79397 | file | 2007-08-14 12:27:13 -0300 (Tue, 14 Aug 2007) | 4 lines

(closes issue #10415)
Reported by: atis
Revert fix for #10327 as it causes more issues then it solves.

........

Modified:
    trunk/   (props changed)
    trunk/res/res_features.c

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

Modified: trunk/res/res_features.c
URL: http://svn.digium.com/view/asterisk/trunk/res/res_features.c?view=diff&rev=79403&r1=79402&r2=79403
==============================================================================
--- trunk/res/res_features.c (original)
+++ trunk/res/res_features.c Tue Aug 14 10:30:03 2007
@@ -804,15 +804,17 @@
 			ast_cdr_setdestchan(transferer->cdr, transferee->name);
 			ast_cdr_setapp(transferer->cdr, "BLINDTRANSFER","");
 		}
-
-		if (!transferee->pbx)
-			res = -1;
-		
-		/* Doh!  Use our handy async_goto functions */
-		ast_verb(3, "Transferring %s to '%s' (context %s) priority 1\n"
-			 ,transferee->name, xferto, transferer_real_context);
-		if (ast_async_goto(transferee, transferer_real_context, xferto, 1))
-			ast_log(LOG_WARNING, "Async goto failed :-(\n");
+		if (!transferee->pbx) {
+			/* Doh!  Use our handy async_goto functions */
+			if (option_verbose > 2) 
+				ast_verbose(VERBOSE_PREFIX_3 "Transferring %s to '%s' (context %s) priority 1\n"
+								,transferee->name, xferto, transferer_real_context);
+			if (ast_async_goto(transferee, transferer_real_context, xferto, 1))
+				ast_log(LOG_WARNING, "Async goto failed :-(\n");
+		} else {
+			/* Set the channel's new extension, since it exists, using transferer context */
+			set_c_e_p(transferee, transferer_real_context, xferto, 0);
+		}
 		check_goto_on_transfer(transferer);
 		return res;
 	} else {