* lily/page-turn-engraver.cc (breakable_column): remove an always-true

[lilypond.git] / lily / note-collision.cc

diff --git a/lily/note-collision.cc b/lily/note-collision.cc
index 1df0a6c7aba7f8d0ff68ef226ee174fae7c089b8..d9a08dcdc87741f8f7b50b1466e8c4b40c8af208 100644 (file)
--- a/lily/note-collision.cc
+++ b/lily/note-collision.cc
@@ -305,7 +305,9 @@ Note_collision_interface::calc_positioning_done (SCM smob)
       if (cg[d].size ())
        {
          Grob *h = cg[d][0];
-         wid = Note_column::first_head (h)->extent (h, X_AXIS).length ();
+         Grob *fh = Note_column::first_head (h);
+         if (fh)
+           wid = fh->extent (h, X_AXIS).length ();
        }
     }
   while (flip (&d) != UP);
@@ -369,7 +371,7 @@ Note_collision_interface::get_clash_groups (Grob *me)
   do
     {
       vector<Grob*> &clashes (clash_groups[d]);
-      vector_sort (clashes, Note_column::shift_compare);
+      vector_sort (clashes, Note_column::shift_less);
     }
   while ((flip (&d)) != UP);