fix #305134: crash on chordsymbol playback

musescore · May 9, 2020 · 108d4ea · 108d4ea
1 parent 5eaa04f
commit 108d4ea
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 11 deletions.
diff --git a/libmscore/part.cpp b/libmscore/part.cpp
@@ -598,7 +598,7 @@ void Part::updateHarmonyChannels(bool isDoOnInstrumentChanged, bool checkRemoval
       if (!harmonyChannel() && harmonyCount() > 0) {
             Instrument* instr = instrument();
             Channel* c = new Channel(*instr->channel(0));
-            c->setName(qApp->translate("channel", Channel::HARMONY_NAME));
+            c->setName(Channel::HARMONY_NAME);
             instr->appendChannel(c);
             onInstrumentChanged();
             }
@@ -610,17 +610,17 @@ void Part::updateHarmonyChannels(bool isDoOnInstrumentChanged, bool checkRemoval
 
 const Channel* Part::harmonyChannel() const
       {
-           const Instrument* instr = instrument();
-           if (!instr)
-                 return nullptr;
+            const Instrument* instr = instrument();
+            if (!instr)
+                  return nullptr;
 
-           int chanIdx = instr->channelIdx(Channel::HARMONY_NAME);
-           if (chanIdx == -1)
-                 return nullptr;
+            int chanIdx = instr->channelIdx(Channel::HARMONY_NAME);
+            if (chanIdx == -1)
+                  return nullptr;
 
-           const Channel* chan = instr->channel(chanIdx);
-           Q_ASSERT(chan);
-           return chan;
+            const Channel* chan = instr->channel(chanIdx);
+            Q_ASSERT(chan);
+            return chan;
       }
 
 //---------------------------------------------------------

diff --git a/mscore/articulationprop.cpp b/mscore/articulationprop.cpp
@@ -61,6 +61,10 @@ ArticulationProperties::ArticulationProperties(Articulation* na, QWidget* parent
                         channelList->addItem(qApp->translate("channel", Channel::DEFAULT_NAME));
                         channelList->item(channelList->count() - 1)->setData(Qt::UserRole, Channel::DEFAULT_NAME);
                         }
+                  else if (a->name() == Channel::HARMONY_NAME) {
+                        channelList->addItem(qApp->translate("channel", Channel::HARMONY_NAME));
+                        channelList->item(channelList->count() - 1)->setData(Qt::UserRole, Channel::HARMONY_NAME);
+                        }
                   else {
                         channelList->addItem(qApp->translate("InstrumentsXML", a->name().toUtf8().data()));
                         channelList->item(channelList->count() - 1)->setData(Qt::UserRole, a->name());

diff --git a/mscore/parteditbase.cpp b/mscore/parteditbase.cpp
@@ -85,7 +85,7 @@ void PartEdit::setPart(Part* p, Channel* a)
       part    = p;
       QString s = part->partName();
       if (!a->name().isEmpty()) {
-            if (a->name() != Channel::DEFAULT_NAME) {
+            if (a->name() != Channel::DEFAULT_NAME && a->name() != Channel::HARMONY_NAME) {
                   s += "-";
                   s += qApp->translate("InstrumentsXML", a->name().toUtf8().data());
                   }

diff --git a/mscore/stafftextproperties.cpp b/mscore/stafftextproperties.cpp
@@ -40,6 +40,8 @@ static void initChannelCombo(QComboBox* cb, StaffTextBase* st)
       for (const Channel* a : part->instrument(tick)->channel()) {
             if (a->name().isEmpty() || a->name() == Channel::DEFAULT_NAME)
                   cb->addItem(qApp->translate("channel", Channel::DEFAULT_NAME));
+            else if (a->name() == Channel::HARMONY_NAME)
+                  cb->addItem(qApp->translate("channel", Channel::HARMONY_NAME));
             else
                   cb->addItem(qApp->translate("InstrumentsXML", a->name().toUtf8().data()));
             }
@@ -186,6 +188,8 @@ StaffTextProperties::StaffTextProperties(const StaffTextBase* st, QWidget* paren
             item->setData(0, Qt::UserRole, i);
             if (a->name().isEmpty() || a->name() == Channel::DEFAULT_NAME)
                   item->setText(0, qApp->translate("channel", Channel::DEFAULT_NAME));
+            else if (a->name() == Channel::HARMONY_NAME)
+                  item->setText(0, qApp->translate("channel", Channel::HARMONY_NAME));
             else
                   item->setText(0, qApp->translate("InstrumentsXML", a->name().toUtf8().data()));
             item->setText(1, qApp->translate("InstrumentsXML", a->descr().toUtf8().data()));
@@ -392,6 +396,10 @@ void StaffTextProperties::channelItemChanged(QTreeWidgetItem* item, QTreeWidgetI
                   ti->setText(0, qApp->translate("channel", Channel::DEFAULT_NAME));
                   ti->setData(0, Qt::UserRole, Channel::DEFAULT_NAME);
                   }
+            else if (e.name == Channel::HARMONY_NAME) {
+                  ti->setText(0, qApp->translate("channel", Channel::HARMONY_NAME));
+                  ti->setData(0, Qt::UserRole, Channel::HARMONY_NAME);
+                  }
             else {
                   ti->setText(0, qApp->translate("InstrumentsXML", e.name.toUtf8().data()));
                   ti->setData(0, Qt::UserRole, e.name);
@@ -404,6 +412,10 @@ void StaffTextProperties::channelItemChanged(QTreeWidgetItem* item, QTreeWidgetI
                   ti->setText(0, qApp->translate("channel", Channel::DEFAULT_NAME));
                   ti->setData(0, Qt::UserRole, Channel::DEFAULT_NAME);
                   }
+            else if (e.name == Channel::HARMONY_NAME) {
+                  ti->setText(0, qApp->translate("channel", Channel::HARMONY_NAME));
+                  ti->setData(0, Qt::UserRole, Channel::HARMONY_NAME);
+                  }
             else {
                   ti->setText(0, qApp->translate("InstrumentsXML", e.name.toUtf8().data()));
                   ti->setData(0, Qt::UserRole, e.name);