Merged revisions 60798 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r60798 | file | 2007-04-08 21:03:14 -0400 (Sun, 08 Apr 2007) | 10 lines

Merged revisions 60797 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r60797 | file | 2007-04-08 20:59:29 -0400 (Sun, 08 Apr 2007) | 2 lines

When calling a device that then forwards us elsewhere... we have to make our channels compatible if it is the only channel being dialed. (issue #9445 reported by marcelbarbulescu)

........

................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@60799 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_dial.c b/apps/app_dial.c
index e83f80a0e7b468c03e66ca90469a7ede51d7ec64..38fc338b4be5949b6f4d179ae2911b059aad7e75 100644 (file)
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
@@ -459,10 +459,12 @@ static void do_forward(struct chanlist *o,
                } else {
                        /* Setup parameters */
                        c = o->chan = ast_request(tech, in->nativeformats, stuff, &cause);
-                       if (!c)
-                               ast_log(LOG_NOTICE, "Unable to create local channel for call forward to '%s/%s' (cause = %d)\n", tech, stuff, cause);
-                       else
+                       if (c) {
+                               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)