X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic-sequence.cc;h=7a0d5863a09321e51bd0d019fc046339a50d21be;hb=22a1ca1e4d1f51b254e68d32cd29f604cb3e9423;hp=906419405fed1cdf41b3bc22818eeaf7f88cce81;hpb=108cf0e8c08c8e15e2a800feb161cfad9057daa8;p=lilypond.git diff --git a/lily/music-sequence.cc b/lily/music-sequence.cc index 906419405f..7a0d5863a0 100644 --- a/lily/music-sequence.cc +++ b/lily/music-sequence.cc @@ -3,14 +3,15 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2005 Han-Wen Nienhuys + (c) 1998--2007 Han-Wen Nienhuys */ +#include "music-sequence.hh" + #include "warn.hh" #include "program-option.hh" -#include "pitch.hh" +#include "music.hh" #include "input.hh" -#include "music-sequence.hh" void transpose_music_list (SCM lst, Pitch rq) @@ -47,8 +48,13 @@ Music_sequence::maximum_length (SCM l) for (SCM s = l; scm_is_pair (s); s = scm_cdr (s)) { Music *m = unsmob_music (scm_car (s)); - Moment l = m->get_length (); - dur = max (dur, l); + if (!m) + programming_error ("Music sequence should have music elements"); + else + { + Moment l = m->get_length (); + dur = max (dur, l); + } } return dur;