* lily/musical-request.cc: do ADD_MUSIC for String_number_req.

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

diff --git a/lily/part-combine-music-iterator.cc b/lily/part-combine-music-iterator.cc
index 4d5682d06e79b3e1e8fb6d24a857ba0727c4f25b..09f019e9907e368b8a8d21f588bad9fc7b5960f3 100644 (file)
--- a/lily/part-combine-music-iterator.cc
+++ b/lily/part-combine-music-iterator.cc
@@ -31,11 +31,12 @@ Part_combine_music_iterator::derived_mark () const
     scm_gc_mark(second_iter_->self_scm());
 }
 
+
 Part_combine_music_iterator::Part_combine_music_iterator (Part_combine_music_iterator const &src)
   : Music_iterator (src)
 {
-  second_iter_ = src.second_iter_ ? src.second_iter_->clone () : 0;
   first_iter_ = src.first_iter_ ? src.first_iter_->clone () : 0;
+  second_iter_ = src.second_iter_ ? src.second_iter_->clone () : 0;
 
   first_until_ = src.first_until_;
   second_until_ = src.second_until_;
@@ -184,10 +185,11 @@ Part_combine_music_iterator::get_state (Moment)
       Moment second_mom = second_until_;
       Moment diff_until = diff_mom + now;
 
+
       bool first = true;
       Music_iterator *first_iter = first_iter_->clone ();
       Music_iterator *second_iter = second_iter_->clone ();
-
+      
       Moment last_pending (-1);
       Moment pending = now;
       while (now < diff_until
@@ -319,9 +321,10 @@ Part_combine_music_iterator::get_state (Moment)
            second_iter->skip (pending);
          now = pending;
        }
-      scm_gc_unprotect_object ( first_iter->self_scm());
-      scm_gc_unprotect_object( second_iter->self_scm());
+      scm_gc_unprotect_object (first_iter->self_scm ());
+      scm_gc_unprotect_object (second_iter->self_scm ());
     }
+
   return state;
 }