summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorTilghman Lesher <tilghman@meg.abyt.es>2007-02-06 07:07:22 +0000
committerTilghman Lesher <tilghman@meg.abyt.es>2007-02-06 07:07:22 +0000
commit5f3b3d235847caa5de9aab9f9ecd4d0518a8ceab (patch)
treefee223567d96dbf720f9094b1b3f20d23ac71437 /main
parentf303a4db4693bbf644cd3f48d70221c9ff2f6b82 (diff)
Merged revisions 53246 via svnmerge from
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
Diffstat (limited to 'main')
-rw-r--r--main/manager.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/main/manager.c b/main/manager.c
index 4a63b6764..a96818e8a 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -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)