[asterisk-commits] file: branch 1.4 r50895 - /branches/1.4/main/manager.c

[asterisk-commits at lists.digium.com]

Author: file
Date: Mon Jan 15 10:36:07 2007
New Revision: 50895

URL: http://svn.digium.com/view/asterisk?view=rev&rev=50895
Log:
Move event processing into do_message so that it gets executed again when events are tripped.

Modified:
    branches/1.4/main/manager.c

Modified: branches/1.4/main/manager.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/manager.c?view=diff&rev=50895&r1=50894&r2=50895
==============================================================================
--- branches/1.4/main/manager.c (original)
+++ branches/1.4/main/manager.c Mon Jan 15 10:36:07 2007
@@ -2059,6 +2059,11 @@
 	int res;
 
 	for (;;) {
+		/* Check if any events are pending and do them if needed */
+		if (s->eventq->next) {
+			if (process_events(s))
+				return -1;
+		}
 		res = get_input(s, header_buf);
 		if (res == 0) {
 			continue;
@@ -2086,14 +2091,8 @@
 	astman_append(s, "Asterisk Call Manager/1.0\r\n");
 	ast_mutex_unlock(&s->__lock);
 	for (;;) {
-		res = do_message(s);
-		
-		if (res < 0) {
+		if ((res = do_message(s)) < 0)
 			break;
-		} else if (s->eventq->next) {
-			if (process_events(s))
-				break;
-		}
 	}
 	if (s->authenticated) {
 		if (option_verbose > 1) {