Fix #334025: Export missing instrument-sound tag

Backport of musescore#12680
Jojo-Schmitz · Aug 5, 2022 · 232b188 · 232b188
1 parent 693707b
commit 232b188
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/importexport/musicxml/exportxml.cpp b/importexport/musicxml/exportxml.cpp
@@ -5621,10 +5621,12 @@ static int findPartGroupNumber(int* partGroupEnd)
 //  scoreInstrument
 //---------------------------------------------------------
 
-static void scoreInstrument(XmlWriter& xml, const int partNr, const int instrNr, const QString& instrName)
+static void scoreInstrument(XmlWriter& xml, const int partNr, const int instrNr, const QString& instrName, const Instrument* instr = nullptr)
       {
       xml.stag(QString("score-instrument %1").arg(instrId(partNr, instrNr)));
       xml.tag("instrument-name", instrName);
+      if (instr && !instr->instrumentId().isEmpty() && !MScore::testMode)
+            xml.tag("instrument-sound", instr->instrumentId());
       xml.etag();
       }
 
@@ -6115,7 +6117,7 @@ static void partList(XmlWriter& xml, Score* score, MxmlInstrumentMap& instrMap)
                   MxmlReverseInstrumentMap rim;
                   initReverseInstrMap(rim, instrMap);
                   for (int instNr : rim.keys()) {
-                        scoreInstrument(xml, idx + 1, instNr + 1, MScoreTextToMXML::toPlainText(rim.value(instNr)->trackName()));
+                        scoreInstrument(xml, idx + 1, instNr + 1, MScoreTextToMXML::toPlainText(rim.value(instNr)->trackName()), rim.value(instNr));
                         }
                   for (auto ii = rim.constBegin(); ii != rim.constEnd(); ii++) {
                         int instNr = ii.key();