diff options
author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-01-22 15:16:12 +0000 |
---|---|---|
committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-01-22 15:16:12 +0000 |
commit | 6020222ed715cae0c1784d6bd13a66ceb4afef3b (patch) | |
tree | 596217a8cbcce24c97cd55a7f3097ddbc46fc1a8 /main/pbx.c | |
parent | 3f880aa41d8191f3f4519dbfbd322d26fb63fe14 (diff) |
Merged revisions 170051 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r170051 | file | 2009-01-22 11:14:50 -0400 (Thu, 22 Jan 2009) | 13 lines
Merged revisions 170050 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r170050 | file | 2009-01-22 11:13:56 -0400 (Thu, 22 Jan 2009) | 6 lines
Do a string comparison instead of pointer comparison since some people specify the context they are actually in as an argument to get around some funkiness.
(closes issue #14011)
Reported by: dveiga
Patches:
pbx.c.patch uploaded by dveiga (license 665)
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@170053 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/pbx.c')
-rw-r--r-- | main/pbx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/pbx.c b/main/pbx.c index a9d011e13..37f2edcef 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -8109,7 +8109,7 @@ static int pbx_builtin_background(struct ast_channel *chan, void *data) ast_stopstream(chan); } } - if (args.context != chan->context && res) { + if (strcmp(args.context, chan->context) && res) { snprintf(chan->exten, sizeof(chan->exten), "%c", res); ast_copy_string(chan->context, args.context, sizeof(chan->context)); chan->priority = 0; |