From 849c3ff6df01e682cfd89ad87bcacf328f6a529e Mon Sep 17 00:00:00 2001 From: Erik Sandberg Date: Sun, 4 Dec 2005 21:27:11 +0000 Subject: [PATCH] * lily/part-combine-iterator.cc: Minor bugfix * THANKS: Update bughunters --- ChangeLog | 6 ++++++ THANKS | 10 +++++++++- lily/part-combine-iterator.cc | 2 +- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 87a6c94763..7ae44f8c7e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-12-04 Erik Sandberg + + * lily/part-combine-iterator.cc: Minor bugfix + + * THANKS: Update bughunters + 2005-12-02 Werner Lemberg * mf/README: Document process for proper mf2pt1 conversion. diff --git a/THANKS b/THANKS index 81cbbfb5d2..d99c42c56e 100644 --- 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 65b4fe6c3a..bca231bb4a 100644 --- 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; } } -- 2.39.2