aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2007-07-23 18:28:13 +0000
committerfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2007-07-23 18:28:13 +0000
commit21a60235f04711ce02fc377345e539d89b2d0d78 (patch)
treed228943a20216efd018df8191923c2c1b3dca64e
parent383df3c0895261469aba6f912b918349fe9357bf (diff)
(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/branches/1.2@76653 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--channels/chan_agent.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/channels/chan_agent.c b/channels/chan_agent.c
index c106162e4..53d7d1067 100644
--- a/channels/chan_agent.c
+++ b/channels/chan_agent.c
@@ -217,9 +217,9 @@ static struct agent_pvt *agents = NULL; /**< Holds the list of agents (loaded f
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)