Index: channel.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channel.c,v
retrieving revision 1.139.2.9
diff -u -r1.139.2.9 channel.c
--- channel.c	16 May 2005 03:10:20 -0000	1.139.2.9
+++ channel.c	31 May 2005 04:44:13 -0000
@@ -1017,6 +1017,12 @@
 #endif			
 		}
 		return NULL;
+        } else {
+		/* If no fds signalled, then timeout. So set ms = 0
+		   since we may not have an exact timeout.
+		*/
+		if (res == 0)
+			*ms = 0;
 	}
 
 	if (havewhen)