fix #304057: fixed harmony being reset when loading

Manually rebased #5967 on 3.x
musescore · Jun 6, 2020 · c5be9ad · c5be9ad
1 parent 3419430
commit c5be9ad
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/libmscore/fret.cpp b/libmscore/fret.cpp
@@ -814,7 +814,7 @@ void FretDiagram::read(XmlReader& e)
             else if (tag == "Harmony") {
                   Harmony* h = new Harmony(score());
                   h->read(e);
-                  add(h);
+                  addLoaded(h);
                   }
             else if (!Element::readProperties(e))
                   e.unknown();
@@ -1199,8 +1199,26 @@ void FretDiagram::add(Element* e)
             _harmony->setProperty(Pid::ALIGN, int(Align::HCENTER | Align::TOP));
             _harmony->setPropertyFlags(Pid::ALIGN, PropertyFlags::UNSTYLED);
             }
-      else
+      else {
             qWarning("FretDiagram: cannot add <%s>\n", e->name());
+            }
+      }
+
+//---------------------------------------------------------
+//   addLoaded
+//    used to add harmonies in read()
+//---------------------------------------------------------
+
+void FretDiagram::addLoaded(Element* e)
+      {
+      e->setParent(this);
+      if (e->isHarmony()) {
+            _harmony = toHarmony(e);
+            _harmony->setTrack(track());
+            }
+      else {
+            qWarning("FretDiagram: cannot add <%s>\n", e->name());
+            }
       }
 
 //---------------------------------------------------------

diff --git a/libmscore/fret.h b/libmscore/fret.h
@@ -227,6 +227,7 @@ class FretDiagram final : public Element {
       void init(Ms::StringData*, Chord*);
 
       void add(Element*) override;
+      void addLoaded(Element*);
       void remove(Element*) override;
 
       bool acceptDrop(EditData&) const override;