release commit

[lilypond.git] / lily / lyric-combine-music-iterator.cc

diff --git a/lily/lyric-combine-music-iterator.cc b/lily/lyric-combine-music-iterator.cc
index 2e9a870ba1d96dbffb451520f3a39c60a3556c54..4715b76998932167d4e52fcf01443b9e0e53e020 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
@@ -158,8 +157,8 @@ Lyric_combine_music_iterator::do_quit ()
     music_iter_->quit();
   if (lyric_iter_)
     lyric_iter_->quit();
-  
 }
+
 Lyric_combine_music_iterator::Lyric_combine_music_iterator (Lyric_combine_music_iterator const & src)
     : Music_iterator (src)
 {