release: 1.3.6

[lilypond.git] / lily / auto-beam-engraver.cc

diff --git a/lily/auto-beam-engraver.cc b/lily/auto-beam-engraver.cc
index 294a1d2858f2bc0e1c1cdb5d98e1cb4c5d411cbe..bbba952ad21ebed9ae66f8689aa6c4f030074946 100644 (file)
--- a/lily/auto-beam-engraver.cc
+++ b/lily/auto-beam-engraver.cc
@@ -105,7 +105,11 @@ Auto_beam_engraver::consider_end_and_begin (Moment test_mom)
   /*
     first guess: end beam at end of beat
   */
-  Moment end_mom = timer_l_->one_beat_;
+  SCM one (get_property ("beatLength", 0));
+
+  Moment end_mom;
+  if (SMOB_IS_TYPE_B(Moment, one))
+    end_mom = *SMOB_TO_TYPE (Moment, one);
 
   /*
     second guess: property generic time exception