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

[lilypond.git] / lily / spanner.cc

diff --git a/lily/spanner.cc b/lily/spanner.cc
index 53d669365450b6aaf5e550c0643854aa7a26f82c..b5b8a933a21a693d0fe6365051f9e36d9424a45b 100644 (file)
--- a/lily/spanner.cc
+++ b/lily/spanner.cc
@@ -358,11 +358,14 @@ Spanner::set_spacing_rods (SCM smob)
     {
       Rod r;
       Spanner *sp = dynamic_cast<Spanner *> (me);
-      
-
       System *root = get_root_system (me);
-      vector<Item*> cols (root->broken_col_range (sp->get_bound (LEFT)->get_column (),
-                                                 sp->get_bound (RIGHT)->get_column ()));
+      Drul_array<Item*> bounds (sp->get_bound (LEFT),
+                               sp->get_bound (RIGHT));
+      if (!bounds[LEFT] || !bounds[RIGHT])
+       return SCM_UNSPECIFIED;
+      
+      vector<Item*> cols (root->broken_col_range (bounds[LEFT]->get_column (),
+                                                 bounds[RIGHT]->get_column ()));
 
       if (cols.size ())
        {