fix #198831: Regression: Cannot enter rests via mouse on drum staves

musescore · Jul 19, 2017 · d72c3cf · d72c3cf
1 parent b0b536d
commit d72c3cf
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/libmscore/cmd.cpp b/libmscore/cmd.cpp
@@ -3215,6 +3215,7 @@ void Score::cmdAddPitch(const EditData& ed, int note, bool addFlag, bool insert)
             qDebug("cannot enter notes here (no chord rest at current position)");
             return;
             }
+      is.setRest(false);
       const Drumset* ds = is.drumset();
       int octave = 4;
       if (ds) {

diff --git a/libmscore/noteentry.cpp b/libmscore/noteentry.cpp
@@ -47,10 +47,8 @@ NoteVal Score::noteValForPosition(Position pos, bool &error)
 
       switch (st->staffType(tick)->group()) {
             case StaffGroup::PERCUSSION: {
-                  if (_is.rest()) {
-                        error = true;
+                  if (_is.rest())
                         break;
-                        }
                   const Drumset* ds = instr->drumset();
                   nval.pitch        = _is.drumNote();
                   if (nval.pitch < 0) {