fix #277745: reset pointers to Score and ScoreView in Timeline when t…

…hey are destroyed
musescore · Nov 2, 2018 · d5d1ed8 · d5d1ed8
1 parent c864dda
commit d5d1ed8
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/mscore/timeline.cpp b/mscore/timeline.cpp
@@ -2230,6 +2230,7 @@ void Timeline::setScore(Score* s)
       scene()->clear();
 
       if (_score) {
+            connect(_score, &QObject::destroyed, this, &Timeline::objectDestroyed, Qt::UniqueConnection);
             drawGrid(nstaves(), _score->nmeasures());
             changeSelection(SelState::NONE);
             row_names->updateLabels(getLabels(), grid_height);
@@ -2257,12 +2258,25 @@ void Timeline::setScoreView(ScoreView* v)
       {
       _cv = v;
       if (_cv) {
-            connect(_cv, SIGNAL(sizeChanged()), this, SLOT(updateView()));
-            connect(_cv, SIGNAL(viewRectChanged()), this, SLOT(updateView()));
+            connect(_cv, &ScoreView::sizeChanged, this, &Timeline::updateView, Qt::UniqueConnection);
+            connect(_cv, &ScoreView::viewRectChanged, this, &Timeline::updateView, Qt::UniqueConnection);
+            connect(_cv, &QObject::destroyed, this, &Timeline::objectDestroyed, Qt::UniqueConnection);
             updateView();
             }
       }
 
+//---------------------------------------------------------
+//   objectDestroyed
+//---------------------------------------------------------
+
+void Timeline::objectDestroyed(QObject* obj)
+      {
+      if (_cv == obj)
+            setScoreView(nullptr);
+      else if (_score == obj)
+            setScore(nullptr);
+      }
+
 //---------------------------------------------------------
 //   updateView
 //---------------------------------------------------------

diff --git a/mscore/timeline.h b/mscore/timeline.h
@@ -176,6 +176,7 @@ class Timeline : public QGraphicsView {
    private slots:
       void handle_scroll(int value);
       void updateView();
+      void objectDestroyed(QObject*);
 
    public slots:
       void changeSelection(SelState);