Merge pull request #2353 from lasconic/fix-93911

fix #93911: & in Volta text corrupts score
musescore · Jan 22, 2016 · 7eacc13 · 7eacc13
2 parents d54fb01 + cdb2bb6
commit 7eacc13
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/mscore/lineproperties.cpp b/mscore/lineproperties.cpp
@@ -138,15 +138,15 @@ void LineProperties::accept()
             otl->undoChangeProperty(P_ID::END_TEXT_PLACE, int(pt));
 
       if (beginText->text() != otl->beginText())
-            otl->undoChangeProperty(P_ID::BEGIN_TEXT, beginText->text());
+            otl->undoChangeProperty(P_ID::BEGIN_TEXT, Xml::xmlString(beginText->text()));
       else if (otl->beginText().isEmpty())
             otl->setBeginText("");
       if (continueText->text() != otl->continueText())
-            otl->undoChangeProperty(P_ID::CONTINUE_TEXT, continueText->text());
+            otl->undoChangeProperty(P_ID::CONTINUE_TEXT, Xml::xmlString(continueText->text()));
       else if (otl->continueText().isEmpty())
             otl->setContinueText("");
       if (endText->text() != otl->endText())
-            otl->undoChangeProperty(P_ID::END_TEXT, endText->text());
+            otl->undoChangeProperty(P_ID::END_TEXT, Xml::xmlString(endText->text()));
       else if (otl->endText().isEmpty())
             otl->setEndText("");
 

diff --git a/mscore/propertymenu.cpp b/mscore/propertymenu.cpp
@@ -421,7 +421,7 @@ void ScoreView::elementPropertyAction(const QString& cmd, Element* e)
                   QString txt  = vp.getText();
                   QList<int> l = vp.getEndings();
                   if (txt != vs->volta()->text())
-                        vs->volta()->undoChangeProperty(P_ID::BEGIN_TEXT, txt);
+                        vs->volta()->undoChangeProperty(P_ID::BEGIN_TEXT, Xml::xmlString(txt));
                   if (l != vs->volta()->endings())
                         vs->volta()->undoChangeProperty(P_ID::VOLTA_ENDING, QVariant::fromValue(l));
                   }