From: David Kastrup <dak@gnu.org>
Date: Fri, 9 Dec 2011 09:09:53 +0000 (+0100)
Subject: Fix issue 2089: dangerous redefinition of SCM s / Moment s
X-Git-Tag: release/2.15.22-1~20^2~3
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=d90e4c699772218b3da13a72f16a91f39f8a02b8;p=lilypond.git

Fix issue 2089: dangerous redefinition of SCM s / Moment s
---

diff --git a/lily/music-sequence.cc b/lily/music-sequence.cc
index e8493b8ada..4e922eb88d 100644
--- a/lily/music-sequence.cc
+++ b/lily/music-sequence.cc
@@ -143,17 +143,15 @@ Music_sequence::minimum_start (SCM l)
 Moment
 Music_sequence::first_start (SCM l)
 {
-  Moment m;
 
   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 start = mus->start_mom ();
+      if (mus->get_length ().to_bool () || start.to_bool ())
+        return start;
     }
-  return m;
+  return Moment ();
 }
 
 MAKE_SCHEME_CALLBACK (Music_sequence, simultaneous_relative_callback, 2);