Skip to content

Commit

Permalink
fix #23382
Browse files Browse the repository at this point in the history
  • Loading branch information
wschweer committed Feb 25, 2014
1 parent 1d39023 commit 7841664
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion libmscore/layout.cpp
Expand Up @@ -1160,7 +1160,7 @@ void Score::createMMRests()
}
}
if (!found) {
Element* ne = e->clone();
Element* ne = e->linkedClone();
ne->setParent(s);
undo(new AddElement(ne));
}
Expand Down
15 changes: 7 additions & 8 deletions libmscore/text.cpp
Expand Up @@ -685,12 +685,12 @@ Text::Text(const Text& st)
: Element(st)
{
_text = st._text;
_layout = st._layout;
_textStyle = st._textStyle;
_layoutToParentWidth = st._layoutToParentWidth;
_layout.clear();
frame = st.frame;
_editMode = false;
_styleIndex = st._styleIndex;
_layoutToParentWidth = st._layoutToParentWidth;
_editMode = false;
_textStyle = st._textStyle;
}

//---------------------------------------------------------
Expand Down Expand Up @@ -1301,10 +1301,9 @@ void Text::endEdit()

genText();
if (links()) {
foreach(Element* e, *links()) {
if (e == this)
continue;
e->undoChangeProperty(P_TEXT, _text);
foreach (Element* e, *links()) {
if (e != this)
e->undoChangeProperty(P_TEXT, _text);
}
}
textChanged();
Expand Down
1 change: 1 addition & 0 deletions mscore/debugger/debugger.cpp
Expand Up @@ -609,6 +609,7 @@ void Debugger::updateElement(Element* el)
case Element::JUMP:
case Element::TEXT:
case Element::STAFF_TEXT:
case Element::REHEARSAL_MARK:
ew = new TextView;
break;
case Element::HARMONY:
Expand Down

0 comments on commit 7841664

Please sign in to comment.