[asterisk-commits] tilghman: branch 1.4 r53246 - in /branches/1.4: ./ main/manager.c

[asterisk-commits at lists.digium.com]

Author: tilghman
Date: Tue Feb  6 01:00:52 2007
New Revision: 53246

URL: http://svn.digium.com/view/asterisk?view=rev&rev=53246
Log:
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:
    branches/1.4/   (props changed)
    branches/1.4/main/manager.c

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

Modified: branches/1.4/main/manager.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/manager.c?view=diff&rev=53246&r1=53245&r2=53246
==============================================================================
--- branches/1.4/main/manager.c (original)
+++ branches/1.4/main/manager.c Tue Feb  6 01:00:52 2007
@@ -1439,7 +1439,6 @@
 	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 @@
 			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)