Merged revisions 53246 via svnmerge from
authorTilghman Lesher <tilghman@meg.abyt.es>
Tue, 6 Feb 2007 07:07:22 +0000 (07:07 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Tue, 6 Feb 2007 07:07:22 +0000 (07:07 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r53246 | tilghman | 2007-02-06 01:00:52 -0600 (Tue, 06 Feb 2007) | 10 lines

Merged revisions 53245 via svnmerge from
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/trunk@53247 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/manager.c

index 4a63b67..a96818e 100644 (file)
@@ -1465,7 +1465,6 @@ static int action_status(struct mansession *s, const struct message *m)
        if (!ast_strlen_zero(id))
                snprintf(idText, sizeof(idText), "ActionID: %s\r\n", id);
 
-       astman_send_ack(s, m, "Channel status will follow");
        if (all)
                c = ast_channel_walk_locked(NULL);
        else {
@@ -1475,6 +1474,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)