From c7b120bbc06aaa05ebabdaeaf7de4b7eba98d883 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Thu, 2 Oct 2003 15:29:25 +0000 Subject: [PATCH] * lily/lyric-combine-music-iterator.cc (Lyric_combine_music_iterator): change init order, to prevent GC segfaults. * lily/context-specced-music-iterator.cc (construct_children): only change translator if found. This fixes a core dump problem. --- ChangeLog | 9 +++++++++ lily/context-specced-music-iterator.cc | 4 ++-- lily/lyric-combine-music-iterator.cc | 6 +++--- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index d5526e218e..b5b0821174 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2003-10-02 Han-Wen Nienhuys + + * lily/lyric-combine-music-iterator.cc + (Lyric_combine_music_iterator): change init order, to prevent GC + segfaults. + + * lily/context-specced-music-iterator.cc (construct_children): + only change translator if found. This fixes a core dump problem. + 2003-10-01 Jan Nieuwenhuizen * buildscripts/install-info-html.sh: Use Bash. diff --git a/lily/context-specced-music-iterator.cc b/lily/context-specced-music-iterator.cc index a5b808a9ba..651ad75418 100644 --- a/lily/context-specced-music-iterator.cc +++ b/lily/context-specced-music-iterator.cc @@ -31,8 +31,8 @@ Context_specced_music_iterator::construct_children () Translator_group* a =report_to ()->find_create_translator (ct, c_id); - - set_translator (a); + if (a) + set_translator (a); Music_wrapper_iterator::construct_children(); } diff --git a/lily/lyric-combine-music-iterator.cc b/lily/lyric-combine-music-iterator.cc index 2e9a870ba1..2390ac6dd5 100644 --- a/lily/lyric-combine-music-iterator.cc +++ b/lily/lyric-combine-music-iterator.cc @@ -49,6 +49,9 @@ Music *melisma_playing_req; Lyric_combine_music_iterator::Lyric_combine_music_iterator () { + music_iter_ =0; + lyric_iter_ =0; + if (!busy_req) { busy_req @@ -56,9 +59,6 @@ Lyric_combine_music_iterator::Lyric_combine_music_iterator () melisma_playing_req = make_music_by_name (ly_symbol2scm ("MelismaPlayingEvent")); } - - music_iter_ =0; - lyric_iter_ =0; } Moment -- 2.39.5