[packages/epic4.git] / epic4-0.9.13-patch1

*** timer.c.orig	Thu Nov 30 15:08:21 2000
--- timer.c	Thu Nov 30 15:14:48 2000
***************
*** 183,188 ****
--- 183,189 ----
  
  static 	TimerList *	PendingTimers;
  static 	char *		current_exec_timer = empty_string;
+ static	int 		parsingtimer = 0;
  
  /*
   * ExecuteTimers:  checks to see if any currently pending timers have
***************
*** 196,202 ****
  {
  	time_t		now;
  	TimerList *	current;
-         static int 	parsingtimer = 0;
  	int		old_from_server = from_server;
  
  	/*
--- 197,202 ----
***************
*** 530,535 ****
--- 530,541 ----
  	time_t	current;
  	time_t	timeout_in;
  
+ 	/* 
+ 	 * If executing ExecuteTimers here would be invalid, then
+ 	 * do not bother telling the caller we are ready.
+ 	 */
+         if (waiting_out > waiting_in || parsingtimer || !PendingTimers)
+                 return 100000;
  	if (!PendingTimers)
  		return 100000;	/* Absurdly large. */
  	time(&current);
Commit	Line	Data
c1cd6af7 AM	1	*** timer.c.orig Thu Nov 30 15:08:21 2000
	2	--- timer.c Thu Nov 30 15:14:48 2000
	3	***************
	4	* 183,188 **
	5	--- 183,189 ----
	6
	7	static TimerList * PendingTimers;
	8	static char * current_exec_timer = empty_string;
	9	+ static int parsingtimer = 0;
	10
	11	/*
	12	* ExecuteTimers: checks to see if any currently pending timers have
	13	***************
	14	* 196,202 **
	15	{
	16	time_t now;
	17	TimerList * current;
	18	- static int parsingtimer = 0;
	19	int old_from_server = from_server;
	20
	21	/*
	22	--- 197,202 ----
	23	***************
	24	* 530,535 **
	25	--- 530,541 ----
	26	time_t current;
	27	time_t timeout_in;
	28
	29	+ /*
	30	+ * If executing ExecuteTimers here would be invalid, then
	31	+ * do not bother telling the caller we are ready.
	32	+ */
	33	+ if (waiting_out > waiting_in \|\| parsingtimer \|\| !PendingTimers)
	34	+ return 100000;
	35	if (!PendingTimers)
	36	return 100000; /* Absurdly large. */
	37	time(&current);