Fix

Author: CubikingChill

src/engraving/dom/instrchange.cpp

@@ -34,7 +34,7 @@
 #include "score.h"
 #include "segment.h"
 #include "staff.h"
-
+#include "../editing/editclef.h"
 #include "log.h"
 
 using namespace mu;
@@ -82,8 +82,15 @@ InstrumentChange::~InstrumentChange()
 void InstrumentChange::setInstrument(const Instrument& i)
 {
     *m_instrument = i;
-    //delete _instrument;
-    //_instrument = new Instrument(i);
+    // Number of staves for this instrument
+    size_t n = i.cleffTypeCount();
+    _concertClefs.resize(n);
+    _transposingClefs.resize(n);
+    for (size_t s = 0; s < n; ++s) {
+        ClefTypeList ct = i.clefType(s);
+        _concertClefs[s]     = ct.concertClef;
+        _transposingClefs[s] = ct.transposingClef;
+    }
 }
 
 void InstrumentChange::setupInstrument(const Instrument* instrument)
@@ -99,19 +106,44 @@ void InstrumentChange::setupInstrument(const Instrument* instrument)
     Interval v = instrument->transpose();
     bool concPitch = style().styleB(Sid::concertPitch);
 
-    // change the clef for each staff
-    for (size_t i = 0; i < part->nstaves(); i++) {
-        ClefType oldClefType = concPitch ? part->instrument(tickStart)->clefType(i).concertClef
-                               : part->instrument(tickStart)->clefType(i).transposingClef;
-        ClefType newClefType = concPitch ? instrument->clefType(i).concertClef
-                               : instrument->clefType(i).transposingClef;
-        // Introduce cleff change only if the new clef *symbol* is different from the old one
-        if (ClefInfo::symId(oldClefType) != ClefInfo::symId(newClefType)) {
-            // If instrument change is at the start of a measure, use the measure as the element, as this will place the instrument change before the barline.
-            EngravingItem* element = rtick().isZero() ? toEngravingItem(findMeasure()) : toEngravingItem(this);
-            score()->undoChangeClef(part->staff(i), element, newClefType, true);
-        }
+// change the clef for each staff
+for (size_t i = 0; i < part->nstaves(); ++i) {
+    ClefType oldClefType = concPitch
+        ? part->instrument(tickStart)->clefType(i).concertClef
+        : part->instrument(tickStart)->clefType(i).transposingClef;
+
+    ClefTypeList ct = instrument->clefType(i);
+    ClefType newClefType = concPitch ? ct.concertClef : ct.transposingClef;
+
+    if (ClefInfo::symId(oldClefType) != ClefInfo::symId(newClefType)) {
+        Measure* measure = segment()->measure();
+        if (!measure || !segment()) continue;
+
+        EngravingItem* element = rtick().isZero()
+            ? static_cast<EngravingItem*>(measure)
+            : static_cast<EngravingItem*>(segment());
+
+        score()->undoChangeClef(part->staff(i), element, newClefType, true);
+
+        // locate the clef just created and set both CP/TP variants for this staff
+        Fraction tick = tickStart;
+        track_idx_t track = part->staff(i)->idx() * VOICES;
+        Measure* m = score()->tick2measure(tick);
+        if (!m) continue;
+        Fraction rt = rtick().isZero() ? m->ticks() : rtick();
+        Segment* seg = m->findSegment(SegmentType::Clef, rt);
+        if (!seg) seg = m->findSegment(SegmentType::HeaderClef, rt);
+        if (!seg) continue;
+        Clef* created = toClef(seg->element(track));
+        if (!created) continue;
+
+        ClefType cp = _concertClefs[i];
+        ClefType tp = _transposingClefs[i];
+
+        score()->undo(new ChangeClefType(created, cp, tp));
     }
+}
+
 
     // Change key signature if necessary. CAUTION: not necessary in case of octave-transposing!
     if ((v.chromatic - oldV.chromatic) % 12) {
@@ -213,4 +245,13 @@ engraving::PropertyValue InstrumentChange::propertyDefault(Pid propertyId) const
         return TextBase::propertyDefault(propertyId);
     }
 }
+
+ClefType InstrumentChange::clefTypeForCurrentLayout(size_t staffIndex) const
+{
+    bool isConcert = score()->style().styleB(Sid::concertPitch);
+    return isConcert
+        ? _concertClefs[staffIndex]
+        : _transposingClefs[staffIndex];
+}
+
 }

src/engraving/dom/instrchange.h

@@ -67,6 +67,11 @@ class InstrumentChange final : public TextBase
 
     bool placeMultiple() const override { return false; }
 
+    ClefType clefTypeForCurrentLayout(size_t staffIndex) const;
+
+    std::vector<ClefType> _concertClefs;
+    std::vector<ClefType> _transposingClefs;
+
 private:
 
     Instrument* m_instrument = nullptr;     // Staff holds ownership if part of score