From 2fae9321fc566eee309b76f9d3722e28bbf74497 Mon Sep 17 00:00:00 2001 From: hanwen Date: Thu, 2 Oct 2003 15:26:39 +0000 Subject: [PATCH] (Lyric_combine_music_iterator): change init order, to prevent GC segfaults. --- ChangeLog | 4 ++++ lily/lyric-combine-music-iterator.cc | 9 ++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0ce091af24..c74ff04e2b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 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. diff --git a/lily/lyric-combine-music-iterator.cc b/lily/lyric-combine-music-iterator.cc index 2e9a870ba1..2848cca140 100644 --- a/lily/lyric-combine-music-iterator.cc +++ b/lily/lyric-combine-music-iterator.cc @@ -32,8 +32,7 @@ protected: virtual void derived_mark () const; private: bool get_busy_status ()const ; - bool melisma_busy (); - + bool melisma_busy (); Music_iterator * music_iter_; Music_iterator * lyric_iter_; @@ -49,6 +48,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 +58,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