Merge pull request #5354 from MarcSabatella/295106-navigation-crash

fix #295106: crash on next element
musescore · Oct 1, 2019 · 55ca960 · 55ca960
2 parents fee7af7 + 6c51400
commit 55ca960
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/libmscore/bsymbol.cpp b/libmscore/bsymbol.cpp
@@ -92,6 +92,7 @@ void BSymbol::add(Element* e)
       {
       if (e->isSymbol() || e->isImage()) {
             e->setParent(this);
+            e->setTrack(track());
             _leafs.append(e);
             toBSymbol(e)->setZ(z() - 1);    // draw on top of parent
             }

diff --git a/libmscore/edit.cpp b/libmscore/edit.cpp
@@ -4479,6 +4479,12 @@ void Score::undoAddElement(Element* element)
                                           }
                                     }
                               }
+                        else if (ne->isFretDiagram()) {
+                              // update track of child harmony
+                              FretDiagram* fd = toFretDiagram(ne);
+                              if (fd->harmony())
+                                    fd->harmony()->setTrack(ntrack);
+                              }
 
                         undo(new AddElement(ne));
                         // transpose harmony if necessary

diff --git a/libmscore/navigate.cpp b/libmscore/navigate.cpp
@@ -537,6 +537,7 @@ Element* Score::nextElement()
       while (e) {
             switch (e->type()) {
                   case ElementType::NOTE:
+                  case ElementType::REST:
                   case ElementType::CHORD: {
                         Element* next = e->nextElement();
                         if (next)

diff --git a/libmscore/segment.cpp b/libmscore/segment.cpp
@@ -1506,7 +1506,9 @@ Element* Segment::nextElement(int activeStaff)
             case ElementType::STAFF_STATE:
             case ElementType::INSTRUMENT_CHANGE:
             case ElementType::STICKING: {
-                  Element* next = nextAnnotation(e);
+                  Element* next = nullptr;
+                  if (e->parent() == this)
+                        next = nextAnnotation(e);
                   if (next)
                         return next;
                   else {
@@ -1624,7 +1626,9 @@ Element* Segment::prevElement(int activeStaff)
             case ElementType::STAFF_STATE:
             case ElementType::INSTRUMENT_CHANGE:
             case ElementType::STICKING: {
-                  Element* prev = prevAnnotation(e);
+                  Element* prev = nullptr;
+                  if (e->parent() == this)
+                        prev = prevAnnotation(e);
                   if (prev)
                         return prev;
                   if (notChordRestType(this)) {