''

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

diff --git a/lily/note-collision.cc b/lily/note-collision.cc
index 8dcbae3d2c06c075ffceb67c9ec707b8cca247b6..5468ff529f71e2c095259e70625f90de6ee50cb7 100644 (file)
--- a/lily/note-collision.cc
+++ b/lily/note-collision.cc
@@ -80,6 +80,14 @@ check_meshing_chords (Grob*me,
   bool distant_half_collide = false;  
   bool full_collide = false;  
 
+  /*
+    Let's not crash. 
+   */
+  if (!Note_column::stem_l (cu)
+      || !Note_column::stem_l (cd))
+    return ;
+  
+  
   /*
     TODO:
 
@@ -329,7 +337,7 @@ Note_collision_interface::automatic_shift (Grob *me,
        {
          if (shift[i-1] == shift[i])
            {
-             me->warning (_ ("Too many clashing notecolumns.  Ignoring them."));
+             clashes[0]->warning (_ ("Too many clashing notecolumns.  Ignoring them."));
              return tups;
            }
        }