From: hanwen <hanwen>
Date: Wed, 28 Dec 2005 13:34:36 +0000 (+0000)
Subject: (internal_set_property): don't abort on
X-Git-Tag: release/2.7.38^2~374
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=da6decee87f8e48b3d3205e1ae01ec77e6e175d1;p=lilypond.git

(internal_set_property): don't abort on
calculation-in-progress.
---

diff --git a/ChangeLog b/ChangeLog
index 4b5e9b57a0..8cc4287df1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-12-28  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+	* lily/grob-property.cc (internal_set_property): don't abort on
+	calculation-in-progress.
+
 	* lily/beam.cc (get_default_dir): robustness: don't divide by zero.
 
 	* lily/tuplet-bracket.cc (calc_control_points): oops: typo. Read
diff --git a/lily/grob-property.cc b/lily/grob-property.cc
index 8c68171fa9..c4dce927b4 100644
--- a/lily/grob-property.cc
+++ b/lily/grob-property.cc
@@ -55,6 +55,7 @@ Grob::internal_set_property (SCM sym, SCM v)
     {
       if (!ly_is_procedure (v)
 	  && !is_simple_closure (v)
+	  && v != ly_symbol2scm ("calculation-in-progress") 
 	  && !type_check_assignment (sym, v, ly_symbol2scm ("backend-type?")))
 	abort ();
       check_interfaces_for_property (this, sym);