From 0bf27c80f0baa181974a55c945751e6d809619f4 Mon Sep 17 00:00:00 2001 From: file Date: Mon, 23 Jul 2007 18:31:06 +0000 Subject: Merged revisions 76654 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r76654 | file | 2007-07-23 15:29:48 -0300 (Mon, 23 Jul 2007) | 12 lines Merged revisions 76653 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r76653 | file | 2007-07-23 15:28:13 -0300 (Mon, 23 Jul 2007) | 4 lines (closes issue #5866) Reported by: tyler Do not force channel format changes when a generator is present. The generator may have changed the formats itself and changing them back would cause issues. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@76655 f38db490-d61c-443f-a65b-d21fe96a405b --- channels/chan_agent.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'channels/chan_agent.c') diff --git a/channels/chan_agent.c b/channels/chan_agent.c index 5590567ec..54840c534 100644 --- a/channels/chan_agent.c +++ b/channels/chan_agent.c @@ -191,9 +191,9 @@ static AST_LIST_HEAD_STATIC(agents, agent_pvt); /*!< Holds the list of agents (l ast_set_read_format(ast, ast->readformat); \ ast_set_write_format(ast, ast->writeformat); \ } \ - if (p->chan->readformat != ast->rawreadformat) \ + if (p->chan->readformat != ast->rawreadformat && !p->chan->generator) \ ast_set_read_format(p->chan, ast->rawreadformat); \ - if (p->chan->writeformat != ast->rawwriteformat) \ + if (p->chan->writeformat != ast->rawwriteformat && !p->chan->generator) \ ast_set_write_format(p->chan, ast->rawwriteformat); \ } \ } while(0) -- cgit v1.2.3