]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merged revisions 170047 via svnmerge from
authorJoshua Colp <jcolp@digium.com>
Thu, 22 Jan 2009 15:03:56 +0000 (15:03 +0000)
committerJoshua Colp <jcolp@digium.com>
Thu, 22 Jan 2009 15:03:56 +0000 (15:03 +0000)
https://origsvn.digium.com/svn/asterisk/trunk

........
  r170047 | file | 2009-01-22 11:01:54 -0400 (Thu, 22 Jan 2009) | 4 lines

  Clear the autoloop flag when parsing and setting the context/extension/priority to go back to. When the channel executes a PBX again we want it to start out at the point we explicitly say and at that point it will not yet be doing autoloop.
  (closes issue #14304)
  Reported by: jcovert
........

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

apps/app_parkandannounce.c

index dc1d4c8c555a9a31e6f44bf340825df1a474488c..c256e4eb28ca7c3f7a9be9050ad15361e1f4b54c 100644 (file)
@@ -102,8 +102,10 @@ static int parkandannounce_exec(struct ast_channel *chan, void *data)
        dialtech = strsep(&args.dial, "/");
        ast_verb(3, "Dial Tech,String: (%s,%s)\n", dialtech, args.dial);
 
-       if (!ast_strlen_zero(args.return_context))
+       if (!ast_strlen_zero(args.return_context)) {
+               ast_clear_flag(chan, AST_FLAG_IN_AUTOLOOP);
                ast_parseable_goto(chan, args.return_context);
+       }
 
        ast_verb(3, "Return Context: (%s,%s,%d) ID: %s\n", chan->context, chan->exten, chan->priority, chan->cid.cid_num);
                if (!ast_exists_extension(chan, chan->context, chan->exten, chan->priority, chan->cid.cid_num)) {