(Lyric_combine_music_iterator): change init order, to prevent GC

segfaults.

diff --git a/ChangeLog b/ChangeLog
index 0ce091af2460c0467aa17fcd7055b036ad44b247..c74ff04e2b801f5fc4eb399698cacd5916a8a6a0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2003-10-02  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
+       * 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 2e9a870ba1d96dbffb451520f3a39c60a3556c54..2848cca140ecf73096a3c297453b8f8c1fab02d0 100644 (file)
--- 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