Merge pull request musescore#1300 from mgavioli/Edit_element_only_if_…

…isEditable Enter Edit Mode on an element only if isEditable()
chenlung · Sep 10, 2014 · 1479442 · 1479442
2 parents 36380df + 8b686a3
commit 1479442
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/mscore/editelement.cpp b/mscore/editelement.cpp
@@ -36,6 +36,10 @@ namespace Ms {
 
 void ScoreView::startEdit(Element* e)
       {
+      if (!e || !e->isEditable()) {
+            qDebug("The element cannot be edited");
+            return;
+            }
       if (e->type() == Element::Type::TBOX)
             e = static_cast<TBox*>(e)->getText();
       editObject = e;
@@ -49,6 +53,10 @@ void ScoreView::startEdit(Element* e)
 
 void ScoreView::startEdit(Element* element, int startGrip)
       {
+      if (!element || !element->isEditable()) {
+            qDebug("The element cannot be edited");
+            return;
+            }
       editObject = element;
       startEdit();
       if (startGrip == -1)

diff --git a/mscore/scoreview.cpp b/mscore/scoreview.cpp
@@ -2583,7 +2583,7 @@ void ScoreView::cmd(const QAction* a)
 
       else if (cmd == "edit-element") {
             Element* e = _score->selection().element();
-            if (e) {
+            if (e && e->isEditable()) {
                   _score->setLayoutAll(false);
                   startEdit(e);
                   }