Merge pull request #2116 from MarcSabatella/68466-spanner-mmrest

fix #68466: spanner changes to length of mmrest
musescore · Jul 11, 2015 · 3f29a6c · 3f29a6c
2 parents ab0ba20 + 14ccf0c
commit 3f29a6c
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/libmscore/spanner.cpp b/libmscore/spanner.cpp
@@ -539,12 +539,14 @@ void Spanner::computeEndElement()
                         qDebug("%s no end element for tick %d", name(), tick2());
                         return;
                         }
-                  int nticks = endCR()->tick() + endCR()->actualTicks() - _tick;
-                  if (_ticks != nticks) {
-                        qDebug("%s ticks changed, %d -> %d", name(), _ticks, nticks);
-                        setTicks(nticks);
-                        if (type() == Element::Type::OTTAVA)
-                              staff()->updateOttava();
+                  if (!endCR()->measure()->isMMRest()) {
+                        int nticks = endCR()->tick() + endCR()->actualTicks() - _tick;
+                        if (_ticks != nticks) {
+                              qDebug("%s ticks changed, %d -> %d", name(), _ticks, nticks);
+                              setTicks(nticks);
+                              if (type() == Element::Type::OTTAVA)
+                                    staff()->updateOttava();
+                              }
                         }
                   }
                   break;