From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Sat, 3 Feb 2007 00:14:03 +0000 (+0100)
Subject: fix #269
X-Git-Tag: release/2.11.16-1~20
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=2b2a6b5e10821bb7bf04e58fcefe087190037d4d;p=lilypond.git

fix #269

Only respond to new_context if we still have lyrics.
---

diff --git a/lily/lyric-combine-music-iterator.cc b/lily/lyric-combine-music-iterator.cc
index 7639e03a8f..bf5d02d8b2 100644
--- a/lily/lyric-combine-music-iterator.cc
+++ b/lily/lyric-combine-music-iterator.cc
@@ -209,6 +209,9 @@ IMPLEMENT_LISTENER (Lyric_combine_music_iterator, check_new_context)
 void
 Lyric_combine_music_iterator::check_new_context (SCM sev)
 {
+  if (!ok ())
+    return ;
+  
   // TODO: Check first if type=Voice and if id matches
   Stream_event * ev = unsmob_stream_event (sev);
   if (ev->get_property ("type") != ly_symbol2scm ("Voice"))