[PD-cvs] pd/src m_sched.c,1.5.4.35.2.1,1.5.4.35.2.2

[Tim Blechmann]

Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31647

Modified Files:
      Tag: devel_0_39
	m_sched.c 
Log Message:
fixing bug in clock_unset

Index: m_sched.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/m_sched.c,v
retrieving revision 1.5.4.35.2.1
retrieving revision 1.5.4.35.2.2
diff -C2 -d -r1.5.4.35.2.1 -r1.5.4.35.2.2
*** m_sched.c	12 Jul 2005 15:11:10 -0000	1.5.4.35.2.1
--- m_sched.c	12 Jul 2005 22:05:24 -0000	1.5.4.35.2.2
***************
*** 101,106 ****
  		{
  			assert (x2->c_next_time != 0);
- 			if (x2->c_next_time == 0) /* todo: remove when checked */
- 				goto done;
  			
  			x_before = x2;
--- 101,104 ----
***************
*** 108,114 ****
  		}
  		
! 		if (x2 == x) /* we're the first in the queue */
  		{
! 			if (x->c_next == NULL) /* we're the only one in the queue */
  				x_before->c_next_time = x->c_next_time;
  			else
--- 106,112 ----
  		}
  		
! 		if (x2 == x) /* we're the first in the settime list */
  		{
! 			if (x->c_next == NULL) /* we're the only one in the list */
  				x_before->c_next_time = x->c_next_time;
  			else
***************
*** 120,135 ****
  		else
  		{
! 			/* find entry */
! 			while (x2->c_next != x)
  			{
! 				assert(x2->c_next);
! 				if (!x2->c_next) /* todo: remove when checked */
! 					goto done;
  				x2 = x2->c_next;
! 			}
! 			x2->c_next = x->c_next;
  		}
  	}
-  done:
  	x->c_settime = -1;
  }
--- 118,132 ----
  		else
  		{
! 			t_clock * before = 0;
! 			do
  			{
! 				before = x2;
  				x2 = x2->c_next;
! 				assert(x2);
! 			} 
! 			while (x2->c_next != x);
! 			before->c_next = x->c_next;
  		}
  	}
  	x->c_settime = -1;
  }