From: Automerge Script <automerge@asterisk.org>
Date: Mon, 23 Jul 2007 19:30:11 +0000 (+0000)
Subject: automerge commit
X-Git-Tag: 1.2.23-netsec~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=46cb5961ea5d45c0b3eb6cabb5b1fe3d0976d70a;p=thirdparty%2Fasterisk.git

automerge commit

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

diff --git a/channels/chan_agent.c b/channels/chan_agent.c
index c106162e4c..53d7d10676 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)