* ly/engraver-init.ly (AncientRemoveEmptyStaffContext): move

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

diff --git a/lily/simultaneous-music-iterator.cc b/lily/simultaneous-music-iterator.cc
index a222cf08561d162ca7256cb7ec062b07bd4553a1..ad0796250a4ed6ac12dbbee63f92956f61abf357 100644 (file)
--- a/lily/simultaneous-music-iterator.cc
+++ b/lily/simultaneous-music-iterator.cc
@@ -10,7 +10,7 @@
 #include "warn.hh"
 #include "simultaneous-music-iterator.hh"
 #include "music-list.hh"
-#include "translator-def.hh"
+#include "context-def.hh"
 
 
 Simultaneous_music_iterator::Simultaneous_music_iterator ()
@@ -161,8 +161,7 @@ Simultaneous_music_iterator::pending_moment () const
   for (SCM s = children_list_; gh_pair_p (s); s = gh_cdr(s))
     {
       Music_iterator * it = unsmob_iterator (gh_car (s));
-      if (!it-> run_always ())
-       next = next <? it->pending_moment ();
+      next = next <? it->pending_moment ();
     }
   
   return next;