Fix infrequent crash when opening project

Model indexes were becoming corrupt if some are processed while the model is reset.
mltframework · Jan 28, 2024 · 83187df · 83187df
1 parent 6b0308d
commit 83187df
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/src/models/audiolevelstask.cpp b/src/models/audiolevelstask.cpp
@@ -208,8 +208,9 @@ void AudioLevelsTask::run()
                     p.first->lock();
                     p.first->set(kAudioLevelsProperty, levelsCopy, 0, (mlt_destructor) deleteQVariantList);
                     p.first->unlock();
-                    if (-1 != m_object->metaObject()->indexOfMethod("audioLevelsReady(QModelIndex)"))
-                        QMetaObject::invokeMethod(m_object, "audioLevelsReady", Q_ARG(const QModelIndex &, p.second));
+                    if (-1 != m_object->metaObject()->indexOfMethod("audioLevelsReady(QPersistentModelIndex)"))
+                        QMetaObject::invokeMethod(m_object, "audioLevelsReady", Q_ARG(const QPersistentModelIndex &,
+                                                                                      p.second));
                 }
             }
         }
@@ -272,8 +273,9 @@ void AudioLevelsTask::run()
             p.first->lock();
             p.first->set(kAudioLevelsProperty, levelsCopy, 0, (mlt_destructor) deleteQVariantList);
             p.first->unlock();
-            if (-1 != m_object->metaObject()->indexOfMethod("audioLevelsReady(QModelIndex)"))
-                QMetaObject::invokeMethod(m_object, "audioLevelsReady", Q_ARG(const QModelIndex &, p.second));
+            if (-1 != m_object->metaObject()->indexOfMethod("audioLevelsReady(QPersistentModelIndex)"))
+                QMetaObject::invokeMethod(m_object, "audioLevelsReady", Q_ARG(const QPersistentModelIndex &,
+                                                                              p.second));
         }
     }
 }
diff --git a/src/models/multitrackmodel.cpp b/src/models/multitrackmodel.cpp
@@ -2456,7 +2456,7 @@ void MultitrackModel::consolidateBlanksAllTracks()
     }
 }
 
-void MultitrackModel::audioLevelsReady(const QModelIndex &index)
+void MultitrackModel::audioLevelsReady(const QPersistentModelIndex &index)
 {
     QVector<int> roles;
     roles << AudioLevelsRole;
@@ -3360,6 +3360,7 @@ int MultitrackModel::getDuration()
 void MultitrackModel::load()
 {
     if (m_tractor) {
+        AudioLevelsTask::closeAll();
         beginResetModel();
         delete m_tractor;
         m_tractor = 0;
@@ -3404,6 +3405,7 @@ void MultitrackModel::reload(bool asynchronous)
         if (asynchronous) {
             emit reloadRequested();
         } else {
+            AudioLevelsTask::closeAll();
             beginResetModel();
             endResetModel();
             getAudioLevels();

diff --git a/src/models/multitrackmodel.h b/src/models/multitrackmodel.h
@@ -101,7 +101,7 @@ class MultitrackModel : public QAbstractItemModel
     QModelIndex makeIndex(int trackIndex, int clipIndex) const;
     QModelIndex parent(const QModelIndex &index) const;
     QHash<int, QByteArray> roleNames() const;
-    Q_INVOKABLE void audioLevelsReady(const QModelIndex &index);
+    Q_INVOKABLE void audioLevelsReady(const QPersistentModelIndex &index);
     bool createIfNeeded();
     void addBackgroundTrack();
     int addAudioTrack();

diff --git a/src/qmltypes/qmlproducer.cpp b/src/qmltypes/qmlproducer.cpp
@@ -172,7 +172,7 @@ void QmlProducer::launchGlaxnimate(const QString &filename) const
     }
 }
 
-void QmlProducer::audioLevelsReady(const QModelIndex &index)
+void QmlProducer::audioLevelsReady(const QPersistentModelIndex &index)
 {
     Q_UNUSED(index)
     emit audioLevelsChanged();

diff --git a/src/qmltypes/qmlproducer.h b/src/qmltypes/qmlproducer.h
@@ -83,7 +83,7 @@ class QmlProducer : public QObject
     {
         return m_producer;
     }
-    Q_INVOKABLE void audioLevelsReady(const QModelIndex &index);
+    Q_INVOKABLE void audioLevelsReady(const QPersistentModelIndex &index);
     Q_INVOKABLE void remakeAudioLevels();
     double displayAspectRatio();
     Q_INVOKABLE QString get(QString name, int position = -1);