From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Thu, 21 Apr 2011 18:35:22 +0000 (+0200)
Subject: MIDI: #'instrument mode: do not re-initialize channel with empty instrument.
X-Git-Tag: release/2.13.62-1~5
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=58a4e27a048b489f65460fc808b4ee217e5d4eed;p=lilypond.git

MIDI: #'instrument mode: do not re-initialize channel with empty instrument.
---

diff --git a/lily/staff-performer.cc b/lily/staff-performer.cc
index 2fd85fe482..502c289e0c 100644
--- a/lily/staff-performer.cc
+++ b/lily/staff-performer.cc
@@ -261,7 +261,7 @@ Staff_performer::acknowledge_audio_element (Audio_element_info inf)
       string str = new_instrument_string ();
       if (channel_mapping != ly_symbol2scm ("instrument"))
 	channel_ = get_channel (voice);
-      else if (str.empty ())
+      else if (channel_ < 0 && str.empty ())
 	channel_ = get_channel (str);
       if (str.length ())
 	{