]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merged revisions 273054 via svnmerge from
authorTilghman Lesher <tilghman@meg.abyt.es>
Tue, 29 Jun 2010 22:41:16 +0000 (22:41 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Tue, 29 Jun 2010 22:41:16 +0000 (22:41 +0000)
https://origsvn.digium.com/svn/asterisk/trunk

........
  r273054 | tilghman | 2010-06-29 17:39:22 -0500 (Tue, 29 Jun 2010) | 11 lines

  Send DialPlanComplete as a response, not as a separate event.

  Otherwise, it goes to all manager sessions and may exclude the current session,
  if the Events mask excludes it.

  (closes issue #17504)
   Reported by: rrb3942
   Patches:
         showdialplan_patch.diff uploaded by rrb3942 (license 1003)
   Tested by: rrb3942
........

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

main/pbx.c

index 7d475f1894d26959a53654c8f302e074b8445238..84d168d9a85eb1271b41b49301a875e4e46b65b4 100644 (file)
@@ -6142,7 +6142,7 @@ static int manager_show_dialplan(struct mansession *s, const struct message *m)
                return 0;
        }
 
-       manager_event(EVENT_FLAG_CONFIG, "ShowDialPlanComplete",
+       astman_append(s, "Event: ShowDialPlanComplete\r\n"
                "EventList: Complete\r\n"
                "ListItems: %d\r\n"
                "ListExtensions: %d\r\n"