]> git.donarmstrong.com Git - lilypond.git/commitdiff
simplify Simultaneous_music_iterator::ok
authorDavid Kastrup <dak@gnu.org>
Sat, 4 Jul 2015 08:27:37 +0000 (10:27 +0200)
committerDavid Kastrup <dak@gnu.org>
Sat, 11 Jul 2015 16:56:24 +0000 (18:56 +0200)
lily/simultaneous-music-iterator.cc

index 74f2d6dc9abbb2b14f182bbeeab5db6368f26a60..a61108d511d25f0babcc0dfbbe997a37a0551a33 100644 (file)
@@ -147,16 +147,13 @@ Simultaneous_music_iterator::pending_moment () const
 bool
 Simultaneous_music_iterator::ok () const
 {
-  bool run_always_ok = false;
   for (SCM s = children_list_; scm_is_pair (s); s = scm_cdr (s))
     {
       Music_iterator *it = unsmob<Music_iterator> (scm_car (s));
-      if (!it->run_always ())
+      if (it->ok ())
         return true;
-      else
-        run_always_ok = run_always_ok || it->ok ();
     }
-  return run_always_ok;
+  return false;
 }
 
 bool