[Asterisk-cvs] asterisk/channels chan_h323.c,1.21,1.22

[jeremy at lists.digium.com]

Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv29397

Modified Files:
	chan_h323.c 
Log Message:
re-do the monitor fix (check for io before killing ourself)


Index: chan_h323.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_h323.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- chan_h323.c	6 Jan 2004 16:51:34 -0000	1.21
+++ chan_h323.c	6 Jan 2004 17:31:04 -0000	1.22
@@ -1238,13 +1238,14 @@
 		}
 		ast_mutex_unlock(&iflock);
 
-		pthread_testcancel();
-
 		/* Wait for sched or io */
 		res = ast_sched_wait(sched);
 		if ((res < 0) || (res > 1000))
 			res = 1000;
 		res = ast_io_wait(io, res);
+
+		pthread_testcancel();
+
 		ast_mutex_lock(&monlock);
 		if (res >= 0) 
 			ast_sched_runq(sched);