release: 1.1.1

[lilypond.git] / lily / collision.cc

diff --git a/lily/collision.cc b/lily/collision.cc
index 3a07ce18e1374f84e9842ca49764973f53fda7bc..a9971951b92c19304a06f1bed1e5c8bfd4ba7cc3 100644 (file)
--- a/lily/collision.cc
+++ b/lily/collision.cc
@@ -18,6 +18,7 @@ Collision::Collision()
 void
 Collision::add_column (Note_column* ncol_l)
 {
+  // ugh.  Fixme.
   clash_l_arr_.push (ncol_l);
   add_element (ncol_l);
   add_dependency (ncol_l);
@@ -165,6 +166,10 @@ IMPLEMENT_IS_TYPE_B1(Collision, Item);
 void
 Collision::do_substitute_dependency (Score_element*o_l,Score_element*n_l)
 {
-  clash_l_arr_.substitute ((Note_column*)dynamic_cast <Item *> (o_l),
-                          (Note_column*)(n_l?dynamic_cast <Item *> (n_l):0));
+  if (o_l)
+    {
+      clash_l_arr_.substitute (dynamic_cast<Note_column *> (o_l),
+                              dynamic_cast <Note_column *> (n_l));
+
+    }
 }