From b64f80e4d0c1af52de47d92e8cc79b95a66925bf Mon Sep 17 00:00:00 2001 From: Reinhold Kainhofer Date: Sun, 21 Aug 2011 14:14:35 +0200 Subject: [PATCH] Part-combine: Fix uninitialized last_playing_ member --- lily/part-combine-iterator.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lily/part-combine-iterator.cc b/lily/part-combine-iterator.cc index 4521abc15e..4583d221f6 100644 --- a/lily/part-combine-iterator.cc +++ b/lily/part-combine-iterator.cc @@ -89,7 +89,7 @@ private: Status last_playing_; /* - TODO: this is getting of hand... + TODO: this is getting off hand... */ Context_handle handles_[NUM_OUTLETS]; @@ -135,6 +135,7 @@ Part_combine_iterator::Part_combine_iterator () split_list_ = SCM_EOL; state_ = APART; playing_state_ = APART; + last_playing_ = APART; busy_ = false; notice_busy_ = false; @@ -241,8 +242,7 @@ Part_combine_iterator::unisono (bool silent) Outlet_type c1 = (last_playing_ == SOLO2) ? CONTEXT_NULL : CONTEXT_SHARED; Outlet_type c2 = (last_playing_ == SOLO2) ? CONTEXT_SHARED : CONTEXT_NULL; substitute_both (c1, c2); - kill_mmrest ((last_playing_ == SOLO2) - ? CONTEXT_ONE : CONTEXT_TWO); + kill_mmrest ((last_playing_ == SOLO2) ? CONTEXT_ONE : CONTEXT_TWO); kill_mmrest (CONTEXT_SHARED); if (playing_state_ != UNISONO -- 2.39.2