From ac3843aec735f3b917c57e2ca9c5010707a8f16c Mon Sep 17 00:00:00 2001
From: sammik <samuelmiklas@gmail.com>
Date: Sat, 30 Sep 2023 15:55:49 +0200
Subject: [PATCH] Fix GH#19483: Correct staff for editing instrument after
 instrumentChange

Backport of #19566
---
 mscore/editstaff.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mscore/editstaff.cpp b/mscore/editstaff.cpp
index 5cbca8ba15e9..f85a74be8c00 100644
--- a/mscore/editstaff.cpp
+++ b/mscore/editstaff.cpp
@@ -390,7 +390,7 @@ void EditStaff::apply()
                         score->undo(new ChangePart(part, new Instrument(*part->instrument()), newPartName));  //tick?
                   if (instrumentFieldChanged) {
                         Segment* s = score->tick2segment(_tickStart, true, SegmentType::ChordRest);
-                        const std::vector<Element*> elist = s ? s->findAnnotations(ElementType::INSTRUMENT_CHANGE, part->startTrack(), part->endTrack()) : std::vector<Element*>();
+                        const std::vector<Element*> elist = s ? s->findAnnotations(ElementType::INSTRUMENT_CHANGE, part->startTrack(), part->endTrack() - 1) : std::vector<Element*>();
                         if (elist.size())
                               for (Element* e : elist) // Change instrument in all Instrument Changes (for linked staves)
                                     score->undo(new ChangeInstrument(toInstrumentChange(e), new Instrument(instrument)));