]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merged revisions 53245 via svnmerge from
authorTilghman Lesher <tilghman@meg.abyt.es>
Tue, 6 Feb 2007 07:00:52 +0000 (07:00 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Tue, 6 Feb 2007 07:00:52 +0000 (07:00 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r53245 | tilghman | 2007-02-06 00:58:28 -0600 (Tue, 06 Feb 2007) | 2 lines

Issue 8987 - Status could return two responses (mnicholson)

........

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

main/manager.c

index 0cbdeb7811d0f3087196fb0894c1c99108ff2ea7..4c6dc30b930eceb05c9b927e807e2fe38b43efc6 100644 (file)
@@ -1439,7 +1439,6 @@ static int action_status(struct mansession *s, const struct message *m)
        long elapsed_seconds = 0;
        int all = ast_strlen_zero(name); /* set if we want all channels */
 
-       astman_send_ack(s, m, "Channel status will follow");
        if (!ast_strlen_zero(id))
                snprintf(idText, sizeof(idText), "ActionID: %s\r\n", id);
        if (all)
@@ -1451,6 +1450,7 @@ static int action_status(struct mansession *s, const struct message *m)
                        return 0;
                }
        }
+       astman_send_ack(s, m, "Channel status will follow");
        /* if we look by name, we break after the first iteration */
        while (c) {
                if (c->_bridge)