From 3cace801477aacf1a8d5d2bbafa5aa60129865d3 Mon Sep 17 00:00:00 2001
From: hanwen <hanwen>
Date: Sat, 14 Sep 2002 20:18:07 +0000
Subject: [PATCH] (Simultaneous_music_iterator): protection bugfix.
 (get_pending_events): bugfix: don't use s twice.

---
 ChangeLog                           | 1 +
 lily/music-iterator.cc              | 2 +-
 lily/simultaneous-music-iterator.cc | 6 +++---
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index fdb94e746b..f2714db5d5 100644
--- 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 bf8216ff4b..a6d2a721a4 100644
--- 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 f75d60010d..7b9522790b 100644
--- 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
-- 
2.11.4.GIT