(setup_pedal_bracket): Bugfix: only

dereference valid Grob.

diff --git a/ChangeLog b/ChangeLog
index 8247aec3d40386ce0da2718e37d517b3b0d45be1..1af018c49369cb41072d5b56cc7be27a5175e68b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2002-06-24  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * lily/text-spanner.cc (setup_pedal_bracket): Bugfix: only
+       dereference valid Grob.
+
        * configure.in: Quoting fixes.
 
 2002-06-24  Han-Wen  <hanwen@cs.uu.nl>

diff --git a/lily/text-spanner.cc b/lily/text-spanner.cc
index a6cb05fe9351fe333a3cd403eabd47e8144fe325..53fb7ff19ae25ee899ee5fa80f7b0549679948c5 100644 (file)
--- a/lily/text-spanner.cc
+++ b/lily/text-spanner.cc
@@ -244,17 +244,19 @@ Text_spanner::setup_pedal_bracket(Spanner *me)
   if ( to_boolean (me->get_grob_property ("text-start")) )
     {
       height[LEFT] = 0;
-      Grob * textbit = unsmob_grob (me->get_grob_property("pedal-text"));
       extra_short = padding;
-      if (textbit->internal_has_interface(ly_symbol2scm("text-interface"))) 
-       // for plain text, e.g., Sost. Ped.
+      if (Grob *textbit = unsmob_grob (me->get_grob_property("pedal-text")))
        {
-         SCM text  =  textbit->get_grob_property("text"); 
-         if (gh_string_p (text)) {
-           SCM properties = Font_interface::font_alist_chain (me);
-           Molecule mol = Text_item::text2molecule (me, text, properties);
-           extra_short += mol.extent(X_AXIS).length() / 2;
-         }
+         if (textbit->internal_has_interface(ly_symbol2scm("text-interface")))
+           // for plain text, e.g., Sost. Ped.
+           {
+             SCM text  =  textbit->get_grob_property("text"); 
+             if (gh_string_p (text)) {
+               SCM properties = Font_interface::font_alist_chain (me);
+               Molecule mol = Text_item::text2molecule (me, text, properties);
+               extra_short += mol.extent(X_AXIS).length() / 2;
+             }
+           }
        }
       shorten[RIGHT] -= thick;
     }