(Simultaneous_music_iterator): protection bugfix.

(get_pending_events): bugfix: don't use s twice.

diff --git a/ChangeLog b/ChangeLog
index fdb94e746b8f345f78d09374900514ace10daed9..f2714db5d53e1f373c0deaf6c7429e2c9b670405 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
 
        * lily/simultaneous-music-iterator.cc
        (Simultaneous_music_iterator): protection bugfix.
+       (get_pending_events): bugfix: don't use s twice.
 
        * debian/: debian patches by Anthony Fok.
        

diff --git a/lily/music-iterator.cc b/lily/music-iterator.cc
index bf8216ff4b3b47fca1c1e9d7fef31b809f0c80e9..a6d2a721a44c6b8cc7a95a22bcea03c5ae16692f 100644 (file)
--- a/lily/music-iterator.cc
+++ b/lily/music-iterator.cc
@@ -236,8 +236,8 @@ Music_iterator::derived_mark()const
 void
 Music_iterator::quit ()
 {
-  handle_.quit ();
   do_quit ();
+  handle_.quit ();
 }
 
 void

diff --git a/lily/simultaneous-music-iterator.cc b/lily/simultaneous-music-iterator.cc
index f75d60010d9fe4b77ed52fff763508f26c6e1de6..7b9522790bfab482dc1bad2396b1f1bff4087178 100644 (file)
--- a/lily/simultaneous-music-iterator.cc
+++ b/lily/simultaneous-music-iterator.cc
@@ -48,12 +48,12 @@ Simultaneous_music_iterator::derived_mark()const
 SCM
 Simultaneous_music_iterator::get_pending_events (Moment m)const
 {
-  SCM s = SCM_EOL;
+  SCM l = SCM_EOL;
   for (SCM s = children_list_; gh_pair_p (s); s = gh_cdr(s))
     {
-      s = gh_append2 (unsmob_iterator (gh_car (s))->get_pending_events (m), s);
+      l = gh_append2 (unsmob_iterator (gh_car (s))->get_pending_events (m), l);
     }
-  return s;
+  return l;
 }
 
 void