Merge branch 'master' of git://git.sv.gnu.org/lilypond

[lilypond.git] / lily / context.cc

diff --git a/lily/context.cc b/lily/context.cc
index 7e5ea8ae2ac0c83ee84e30de36f38f8d10590e34..3c982751fd6635e1822ad525a54471a2fb893a07 100644 (file)
--- a/lily/context.cc
+++ b/lily/context.cc
@@ -460,6 +460,13 @@ Context::add_alias (SCM sym)
   aliases_ = scm_cons (sym, aliases_);
 }
 
+/* we don't (yet) instrument context properties */
+void
+Context::instrumented_set_property (SCM sym, SCM val, const char*, int, const char*)
+{
+  internal_set_property (sym, val);
+}
+
 void
 Context::internal_set_property (SCM sym, SCM val)
 {
@@ -710,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)));