From: David Kastrup <dak@gnu.org>
Date: Sat, 4 Jul 2015 08:27:37 +0000 (+0200)
Subject: simplify Simultaneous_music_iterator::ok
X-Git-Tag: release/2.19.23-1~7
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=00529c398859412101d0057e49e058c314299379;p=lilypond.git

simplify Simultaneous_music_iterator::ok
---

diff --git a/lily/simultaneous-music-iterator.cc b/lily/simultaneous-music-iterator.cc
index 74f2d6dc9a..a61108d511 100644
--- a/lily/simultaneous-music-iterator.cc
+++ b/lily/simultaneous-music-iterator.cc
@@ -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