[asterisk-commits] tilghman: trunk r53247 - in /trunk: ./ main/manager.c

[asterisk-commits at lists.digium.com]

Author: tilghman
Date: Tue Feb  6 01:07:22 2007
New Revision: 53247

URL: http://svn.digium.com/view/asterisk?view=rev&rev=53247
Log:
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)

........

................

Modified:
    trunk/   (props changed)
    trunk/main/manager.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/manager.c
URL: http://svn.digium.com/view/asterisk/trunk/main/manager.c?view=diff&rev=53247&r1=53246&r2=53247
==============================================================================
--- trunk/main/manager.c (original)
+++ trunk/main/manager.c Tue Feb  6 01:07:22 2007
@@ -1465,7 +1465,6 @@
 	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 @@
 			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)