Merge branch 'master' of git://git.sv.gnu.org/lilypond

[lilypond.git] / lily / separating-group-spanner.cc

diff --git a/lily/separating-group-spanner.cc b/lily/separating-group-spanner.cc
index 8c07d8e65d7c463ded840c5c186716f7fc38dd43..fb8cce00226d91ec9171f54cca78be2e907cb2da 100644 (file)
--- a/lily/separating-group-spanner.cc
+++ b/lily/separating-group-spanner.cc
@@ -34,10 +34,11 @@ Separating_group_spanner::find_rods (Item *r,
 
       if (lb)
        {
-         Separation_item::set_distance (lb, r, padding);
+         Separation_item::set_distance (Drul_array<Item*> (lb, r), padding);
        }
 
-      Separation_item::set_distance (l, r, padding);
+      if (Separation_item::set_distance (Drul_array<Item *> (l, r), padding))
+       break;
 
       /*
        this grob doesn't cause a constraint. We look further until we