* lily/part-combine-iterator.cc: Minor bugfix

        * THANKS: Update bughunters

diff --git a/ChangeLog b/ChangeLog
index 87a6c9476381433dc52ff67ca2f6f740994b36c3..7ae44f8c7ed27cb3b5c1bc1bb38c7462d783444a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-12-04  Erik Sandberg  <mandolaerik@gmail.com>
+
+       * lily/part-combine-iterator.cc: Minor bugfix
+       
+       * THANKS: Update bughunters
+
 2005-12-02  Werner Lemberg  <wl@gnu.org>
 
        * mf/README: Document process for proper mf2pt1 conversion.

diff --git a/THANKS b/THANKS
index 81cbbfb5d2f7ceac6c157d28a287135cc8071837..d99c42c56e35b168cec08caab8615886262bba26 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -50,17 +50,23 @@ Donald Axel
 Edward Neeman
 Eduardo Vieira
 Erlend Aasland
+Hans Forbrich
+Jukka Akkanen
 Matevž Jekovec
 Michael Welsh Duggan
 Milan Zamazal
+Patrick K Welton
 Ralph Little
-Sean Reed
 Scott Russell
+Sean Reed
+Steven Weber
 Sven Axelsson
 Thomas Bushnell BSG
 Trevor Bača
 Vicente Solsona Dellá
 Vincenzo Colonnella
+Werner Lemberg
+Will Oram
 
 Release 2.6
 ***********
@@ -142,6 +148,7 @@ Ed Jackson
 Erik Ronström
 Fernando Pablo Lopez-Lezcano
 Gilles Sadowski
+Pothárn Imre
 Jack O'Quin
 Jeff Smith
 Johannes Schindelin
@@ -162,6 +169,7 @@ Stephen McCarthy
 Sven Axelsson
 Tapio Tuovila
 Tom Cato Amundsen
+Tyler Eaves
 Will Oram
 Wolfgang Hoffmann
 

diff --git a/lily/part-combine-iterator.cc b/lily/part-combine-iterator.cc
index 65b4fe6c3a652fc1d0b03d2046c2805ddf026561..bca231bb4a987cd459bf5e502c7a725c0d0e4ae1 100644 (file)
--- a/lily/part-combine-iterator.cc
+++ b/lily/part-combine-iterator.cc
@@ -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;
     }
 }