automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@60845 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_dial.c b/apps/app_dial.c
index f3d1c268b1aeecb3e819caa880457743f63f8046..d900a14d2322c3ad5b00fc3f910df85eb6ad5c5d 100644 (file)
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
@@ -470,10 +470,12 @@ static struct ast_channel *wait_for_answer(struct ast_channel *in, struct localu
                                                        ast_verbose(VERBOSE_PREFIX_3 "Now forwarding %s to '%s/%s' (thanks to %s)\n", in->name, tech, stuff, o->chan->name);
                                                /* Setup parameters */
                                                o->chan = ast_request(tech, in->nativeformats, stuff, &cause);
-                                               if (!o->chan)
-                                                       ast_log(LOG_NOTICE, "Unable to create local channel for call forward to '%s/%s' (cause = %d)\n", tech, stuff, cause);
-                                               else
+                                               if (o->chan) {
+                                                       if (single)
+                                                               ast_channel_make_compatible(o->chan, in);
                                                        ast_channel_inherit_variables(in, o->chan);
+                                               } else
+                                                       ast_log(LOG_NOTICE, "Unable to create local channel for call forward to '%s/%s' (cause = %d)\n", tech, stuff, cause);
                                        } else {
                                                if (option_verbose > 2)
                                                        ast_verbose(VERBOSE_PREFIX_3 "Too many forwards from %s\n", o->chan->name);