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

[lilypond.git] / lily / spacing-loose-columns.cc

diff --git a/lily/spacing-loose-columns.cc b/lily/spacing-loose-columns.cc
index cebabe108476f5f44193d2da82a5296642392771..94bc552e6f799ed47c3b8d9ad9b8668077ea6c43 100644 (file)
--- a/lily/spacing-loose-columns.cc
+++ b/lily/spacing-loose-columns.cc
@@ -13,8 +13,9 @@
 #include "staff-spacing.hh"
 #include "note-spacing.hh"
 #include "spacing-spanner.hh"
-
+#include "warn.hh"
 #include "moment.hh"
+#include "spacing-options.hh"
 
 /* Find the loose columns in POSNS, and drape them around the columns
    specified in BETWEEN-COLS.  */
@@ -88,7 +89,10 @@ set_loose_columns (System *which, Column_x_positions const *posns)
            }
          
          Spacing_options options;
-         options.init_from_grob (spacing);
+         if (spacing)
+           options.init_from_grob (spacing);
+         else
+           programming_error ("Column without spacing object");
 
          bool expand_only = false;
          Real base_note_space = 0.0;