follow up on fix #64251

musescore · Jun 22, 2015 · bfc43e8 · bfc43e8
1 parent da3f894
commit bfc43e8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/libmscore/rendermidi.cpp b/libmscore/rendermidi.cpp
@@ -1211,7 +1211,7 @@ void renderChordArticulation(Chord *chord, QList<NoteEventList> & ell, int & gat
             Note *note = chord->notes()[k];
             if ( noteHasGlissando(note))
                   renderGlissando(events, note);
-            else {
+            else if (chord->staff()->isPitchedStaff()) {
                   for (Articulation* a : chord->articulations()) {
                         if ( false == a->playArticulation())
                               continue;

diff --git a/libmscore/staff.cpp b/libmscore/staff.cpp
@@ -820,16 +820,20 @@ bool Staff::isLinked(Staff* staff)
 //---------------------------------------------------------
 //   primaryStaff
 ///   if there are linked staves, the primary staff is
-///   the one who is played back
+///   the one who is played back and it's not a tab staff
+///   because we don't have enough information  to play
+///   e.g ornaments. NOTE: it's not necessarily the top staff!
 //---------------------------------------------------------
 
 bool Staff::primaryStaff() const
       {
       QList<Staff*> s;
       if (!_linkedStaves)
             return true;
+      if (isTabStaff())
+            return false;
       foreach(Staff* staff, _linkedStaves->staves()) {
-            if (staff->score() == score())
+            if (staff->score() == score() && !staff->isTabStaff())
                   s.append(staff);
             }
       return s.front() == this;