*** empty log message ***

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

diff --git a/lily/part-combine-iterator.cc b/lily/part-combine-iterator.cc
index 65b4fe6c3a652fc1d0b03d2046c2805ddf026561..c2625f28c1cf43d3ff1972d8a7583d1a46aefb4f 100644 (file)
--- a/lily/part-combine-iterator.cc
+++ b/lily/part-combine-iterator.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2005 Han-Wen Nienhuys
+  (c) 2004--2006 Han-Wen Nienhuys
 */
 
 #include "context.hh"
@@ -410,8 +410,8 @@ Part_combine_iterator::process (Moment m)
        solo2 ();
       else if (scm_is_symbol (tag))
        {
-         String s = "Unknown split directive: "
-           + (scm_is_symbol (tag) ? ly_symbol2string (tag) : String ("not a symbol"));
+         std::string s = "Unknown split directive: "
+           + (scm_is_symbol (tag) ? ly_symbol2string (tag) : std::string ("not a symbol"));
          programming_error (s);
        }
     }
@@ -426,7 +426,7 @@ Part_combine_iterator::process (Moment m)
   if (second_iter_->ok ())
     {
       second_iter_->process (m);
-      if (first_iter_->try_music_in_children (busy_playing_event))
+      if (second_iter_->try_music_in_children (busy_playing_event))
        last_playing_ = SOLO2;
     }
 }