(music-descriptions): remove

[lilypond.git] / lily / simultaneous-music-iterator.cc

diff --git a/lily/simultaneous-music-iterator.cc b/lily/simultaneous-music-iterator.cc
index 1c5a8002062652b2ca3b8424b807699a912eac22..2d7c66c03119a54724d2938a17dfb90a32df3cc0 100644 (file)
--- a/lily/simultaneous-music-iterator.cc
+++ b/lily/simultaneous-music-iterator.cc
@@ -67,7 +67,9 @@ Simultaneous_music_iterator::construct_children ()
          tail = SCM_CDRLOC (*tail);
        }
       else
-       mi->set_context (0);
+       {
+         mi->quit ();
+       }
     }
 }
 
@@ -104,7 +106,7 @@ Simultaneous_music_iterator::pending_moment () const
   for (SCM s = children_list_; scm_is_pair (s); s = scm_cdr (s))
     {
       Music_iterator *it = unsmob_iterator (scm_car (s));
-      next = next <? it->pending_moment ();
+      next = min (next, it->pending_moment ());
     }
 
   return next;