fix #25394, fix #25457: do not sort notes in chord while looping thro…

…ugh notes in chord
musescore · Apr 19, 2014 · 0a09d44 · 0a09d44
1 parent 9296c7e
commit 0a09d44
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/libmscore/note.cpp b/libmscore/note.cpp
@@ -1865,26 +1865,27 @@ void Note::updateAccidental(AccidentalState* as)
 //    _line is the absolute line
 //---------------------------------------------------------
 
-void Note::updateRelLine()
+void Note::updateRelLine(bool sort)
       {
       Staff* s = score()->staff(staffIdx() + chord()->staffMove());
       ClefType clef = s->clef(chord()->tick());
       int line = relStep(_line, clef);
       if (line != _line) {
             setLine(line);
-            if (chord())
+            if (chord() && sort)
                   chord()->sortNotes();
             }
       }
 
 //---------------------------------------------------------
 //   updateLine
+//   sorting the chord is needed, after calling this method
 //---------------------------------------------------------
 
 void Note::updateLine()
       {
       _line = absStep(tpc(), epitch());
-      updateRelLine();
+      updateRelLine(false);
       }
 
 //---------------------------------------------------------

diff --git a/libmscore/note.h b/libmscore/note.h
@@ -216,7 +216,7 @@ class Note : public Element {
       void addSpanner(Spanner*);
       void removeSpanner(Spanner*);
       int concertPitchIdx() const;
-      void updateRelLine();
+      void updateRelLine(bool sort = true);
 
    public:
       Note(Score* s = 0);