[asterisk-commits] file: trunk r50896 - in /trunk: ./ main/manager.c

[asterisk-commits at lists.digium.com]

Author: file
Date: Mon Jan 15 10:40:48 2007
New Revision: 50896

URL: http://svn.digium.com/view/asterisk?view=rev&rev=50896
Log:
Merged revisions 50895 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r50895 | file | 2007-01-15 11:36:07 -0500 (Mon, 15 Jan 2007) | 2 lines

Move event processing into do_message so that it gets executed again when events are tripped.

........

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=50896&r1=50895&r2=50896
==============================================================================
--- trunk/main/manager.c (original)
+++ trunk/main/manager.c Mon Jan 15 10:40:48 2007
@@ -2135,6 +2135,9 @@
 	int res;
 
 	for (;;) {
+		/* Check if any events are pending and do them if needed */
+		if (process_events(s))
+			return -1;
 		res = get_input(s, header_buf);
 		if (res == 0) {
 			continue;
@@ -2195,8 +2198,7 @@
 	astman_append(s, "Asterisk Call Manager/1.0\r\n");	/* welcome prompt */
 	ast_mutex_unlock(&s->__lock);
 	for (;;) {
-		res = do_message(s);
-		if ((res < 0) || (process_events(s)))
+		if ((res = do_message(s)) < 0)
 			break;
 	}
 	/* session is over, explain why and terminate */