Merge branch 'master' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman

[lilypond.git] / lily / context.cc

diff --git a/lily/context.cc b/lily/context.cc
index f5543c01050be8e69c2cb62cfb5a1742570683f4..3c982751fd6635e1822ad525a54471a2fb893a07 100644 (file)
--- a/lily/context.cc
+++ b/lily/context.cc
@@ -717,7 +717,7 @@ melisma_busy (Context *tr)
   SCM melisma_properties = tr->get_property ("melismaBusyProperties");
   bool busy = false;
 
-  for (; scm_is_pair (melisma_properties);
+  for (; !busy && scm_is_pair (melisma_properties);
        melisma_properties = scm_cdr (melisma_properties))
     busy = busy || to_boolean (tr->internal_get_property (scm_car (melisma_properties)));