diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-11 18:20:18 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-11 18:20:18 +0000 |
| commit | a1e5e9b6643a99df9ebf2c17b6c9d00d506e53c8 (patch) | |
| tree | 0c5e9551ee6aff27e52afd2cfad55ae4550d59e4 /channels/chan_agent.c | |
| parent | 7143b0381c4e95b6081e0e89ae52bdda859f00f1 (diff) | |
Merged revisions 121867 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r121867 | tilghman | 2008-06-11 13:19:24 -0500 (Wed, 11 Jun 2008) | 11 lines
Merged revisions 121861 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r121861 | tilghman | 2008-06-11 13:18:16 -0500 (Wed, 11 Jun 2008) | 3 lines
Make calls to ast_assert() actually test something, so that the error message
printed is not nonsensical (reported by mvanbaak via #asterisk-bugs).
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@121872 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_agent.c')
| -rw-r--r-- | channels/chan_agent.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_agent.c b/channels/chan_agent.c index d44d0881f..f96fac5cf 100644 --- a/channels/chan_agent.c +++ b/channels/chan_agent.c @@ -1018,7 +1018,7 @@ static struct ast_channel *agent_new(struct agent_pvt *p, int state) if (p->chan) { if (ast_test_flag(p->chan, AST_FLAG_BLOCKING)) { ast_log( LOG_ERROR, "A blocker exists after agent channel ownership acquired\n" ); - ast_assert(0); + ast_assert(ast_test_flag(p->chan, AST_FLAG_BLOCKING) == 0); } } return tmp; |