Fix #315599 - MuseScore 3.6 crashes when rearranging instrument posit…

…ions and changing Ordering Add the customized score order always to the filter if the new order is a customized order. Also the never used method ScoreOrderListModel::setCustomizedOrder removed.
musescore · Jan 18, 2021 · d7dd654 · d7dd654
1 parent 9f68f34
commit d7dd654
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 13 deletions.
diff --git a/mscore/instrwidget.cpp b/mscore/instrwidget.cpp
@@ -93,15 +93,6 @@ void ScoreOrderListModel::rebuildData()
       endResetModel();
       }
 
-//---------------------------------------------------------
-//   setCustomizedOrder
-//---------------------------------------------------------
-
-void ScoreOrderListModel::setCustomizedOrder(ScoreOrder* order)
-      {
-      _customizedOrder = (order && order->isCustomized()) ? order : nullptr;
-      }
-
 //---------------------------------------------------------
 //   ScoreOrderFilterProxyModel
 //---------------------------------------------------------
@@ -118,6 +109,7 @@ ScoreOrderFilterProxyModel::ScoreOrderFilterProxyModel(ScoreOrderList* data, QOb
 void ScoreOrderFilterProxyModel::setCustomizedOrder(ScoreOrder* order)
       {
       _customizedOrder = (order && order->isCustomized()) ? order : nullptr;
+      invalidateFilter();
       }
 
 //---------------------------------------------------------
@@ -1239,8 +1231,8 @@ void InstrumentsWidget::updateScoreOrder()
                   if (!custom) {
                         custom = order->clone();
                         scoreOrders.addScoreOrder(custom);
-                        _filter->setCustomizedOrder(custom);
                         }
+                  _filter->setCustomizedOrder(custom);
                   setScoreOrder(custom);
                   }
             }

diff --git a/mscore/instrwidget.h b/mscore/instrwidget.h
@@ -42,16 +42,13 @@ enum { PART_LIST_ITEM = QTreeWidgetItem::UserType, STAFF_LIST_ITEM };
 class ScoreOrderListModel : public QAbstractListModel {
    private:
       ScoreOrderList* _scoreOrders;
-      ScoreOrder* _customizedOrder { nullptr };
 
    public:
       ScoreOrderListModel(ScoreOrderList* data, QObject* parent=nullptr);
       QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
       int rowCount(const QModelIndex& parent = QModelIndex()) const;
       QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const;
       void rebuildData();
-
-      void setCustomizedOrder(ScoreOrder* order);
       };
 
 //---------------------------------------------------------