fix #224121: Crash when clearing palette cell with filter active

musescore · May 19, 2018 · 8498f90 · 8498f90
1 parent d31cfd9
commit 8498f90
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/mscore/paletteBoxButton.cpp b/mscore/paletteBoxButton.cpp
@@ -52,6 +52,8 @@ void PaletteBoxButton::contextMenuEvent(QContextMenuEvent* event)
       QAction* actionEdit       = menu.addAction(tr("Enable Editing"));
       actionEdit->setCheckable(true);
       actionEdit->setChecked(!palette->readOnly());
+      if (palette->isFilterActive())
+            actionEdit->setVisible(false);
 
       bool _systemPalette = palette->systemPalette();
       actionProperties->setDisabled(_systemPalette);

diff --git a/mscore/paletteBoxButton.h b/mscore/paletteBoxButton.h
@@ -52,10 +52,10 @@ class PaletteBoxButton : public QToolButton {
       void upTriggered()         { emit paletteCmd(PaletteCommand::UP, id);      }
       void downTriggered()       { emit paletteCmd(PaletteCommand::DOWN, id);    }
       void newTriggered()        { emit paletteCmd(PaletteCommand::NEW, id);     }
-      void enableEditing(bool);
 
    public slots:
       void showPalette(bool);
+      void enableEditing(bool);
 
    signals:
       void paletteCmd(PaletteCommand, int);

diff --git a/mscore/palettebox.cpp b/mscore/palettebox.cpp
@@ -119,13 +119,13 @@ void PaletteBox::filterPalettes(const QString& text)
             bool f = p->filter(text);
             b->setVisible(!f);
             if (b->isVisible()) {
-                 if (text.isEmpty())
-                      b->showPalette(false);
-                 else
-                      b->showPalette(true);
+                 b->showPalette(!text.isEmpty());
                  }
             else
                  b->showPalette(false);
+
+            // disable editing while palette is filtered
+            b->enableEditing(text.isEmpty());
             }
       }