Fix #324626: Linked dynamics not saving properly

wizofaus · Jojo-Schmitz · commit ccc8713b16da · 2021-09-15T08:46:51.000+02:00
Backport of musescore#9126
diff --git a/libmscore/dynamic.cpp b/libmscore/dynamic.cpp
@@ -320,8 +320,11 @@ void Dynamic::startEdit(EditData& ed)
 void Dynamic::endEdit(EditData& ed)
       {
       TextBase::endEdit(ed);
-      if (xmlText() != QString::fromUtf8(dynList[int(_dynamicType)].text))
-            _dynamicType = Type::OTHER;
+      auto text = xmlText();
+      auto it = std::find_if(std::begin(dynList), std::end(dynList), [text](const Ms::Dyn& d) { return text == QString::fromUtf8(d.text); });
+      _dynamicType = it == std::end(dynList) ? Type::OTHER : static_cast<Type>(it - std::begin(dynList));
+      for (auto* e : this->linkList())
+            toDynamic(e)->_dynamicType = _dynamicType;
       }
 
 //---------------------------------------------------------

Original file line number	Diff line number	Diff line change
`@@ -320,8 +320,11 @@ void Dynamic::startEdit(EditData& ed)`
`320`	`320`	`void Dynamic::endEdit(EditData& ed)`
`321`	`321`	`{`
`322`	`322`	`TextBase::endEdit(ed);`
`323`		`- if (xmlText() != QString::fromUtf8(dynList[int(_dynamicType)].text))`
`324`		`- _dynamicType = Type::OTHER;`
	`323`	`+ auto text = xmlText();`
	`324`	`+ auto it = std::find_if(std::begin(dynList), std::end(dynList), [text](const Ms::Dyn& d) { return text == QString::fromUtf8(d.text); });`
	`325`	`+ _dynamicType = it == std::end(dynList) ? Type::OTHER : static_cast<Type>(it - std::begin(dynList));`
	`326`	`+ for (auto* e : this->linkList())`
	`327`	`+ toDynamic(e)->_dynamicType = _dynamicType;`
`325`	`328`	`}`
`326`	`329`
`327`	`330`	`//---------------------------------------------------------`