From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Sat, 14 Sep 2002 20:18:07 +0000 (+0000)
Subject: (Simultaneous_music_iterator): protection bugfix.
X-Git-Tag: release/1.6.3~7
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=cd09446e6af713b5170bfd1de08b6b3622082377;p=lilypond.git

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

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