From 1bc26969fe372d9e257d91f0ef6e1ca0f9999ed6 Mon Sep 17 00:00:00 2001 From: Don Armstrong Date: Sun, 13 May 2012 16:07:46 -0700 Subject: [PATCH] Fix redefinition of s in Music_sequence::first_start. (Closes #672087). --- debian/changelog | 7 +++++++ lily/music-sequence.cc | 8 ++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index a4bbb2f1c1..f2cb168998 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +lilypond (2.14.2-3) unstable; urgency=low + + * Fix redefinition of s in Music_sequence::first_start. (Closes + #672087). + + -- Don Armstrong Sun, 13 May 2012 16:07:16 -0700 + lilypond (2.14.2-2) unstable; urgency=low * Disable optimization on i386 and kfreebsd-i386 to avoid segfaults with diff --git a/lily/music-sequence.cc b/lily/music-sequence.cc index 8c9642c860..42bfd8719f 100644 --- a/lily/music-sequence.cc +++ b/lily/music-sequence.cc @@ -148,10 +148,10 @@ Music_sequence::first_start (SCM l) for (SCM s = l; scm_is_pair (s); s = scm_cdr (s)) { Music *mus = unsmob_music (scm_car (s)); - Moment l = mus->get_length (); - Moment s = mus->start_mom (); - if (l.to_bool () || s.to_bool ()) - return s; + Moment lt = mus->get_length (); + Moment st = mus->start_mom (); + if (lt.to_bool () || st.to_bool ()) + return st; } return m; } -- 2.39.5