]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merged revisions 170051 via svnmerge from
authorJoshua Colp <jcolp@digium.com>
Thu, 22 Jan 2009 15:15:35 +0000 (15:15 +0000)
committerJoshua Colp <jcolp@digium.com>
Thu, 22 Jan 2009 15:15:35 +0000 (15:15 +0000)
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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@170052 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/pbx.c

index b28c1fbdb52bad0b3c7b1bdfa49d310b6bb8b6a8..eb9cf7ee31a083912d51ebbae396505380a013eb 100644 (file)
@@ -7877,7 +7877,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;