Remaining events apart from verification

1 files changed, 15 insertions, 10 deletions

diff --git a/src/timeline/EventDelegateChooser.cpp b/src/timeline/EventDelegateChooser.cpp

index 7fec38dd..2218d9ee 100644
--- a/src/timeline/EventDelegateChooser.cpp
+++ b/src/timeline/EventDelegateChooser.cpp
@@ -195,17 +195,22 @@ EventDelegateChooser::DelegateIncubator::setInitialState(QObject *obj)
 
     if (!forReply) {
         auto row = chooser.room_->idToIndex(currentId);
-        connect(chooser.room_,
-                &QAbstractItemModel::dataChanged,
-                obj,
-                [row, update](const QModelIndex &topLeft,
-                              const QModelIndex &bottomRight,
-                              const QList<int> &changedRoles) {
-                    if (row < topLeft.row() || row > bottomRight.row())
-                        return;
+        auto connection = connect(
+          chooser.room_,
+          &QAbstractItemModel::dataChanged,
+          obj,
+          [row, update](const QModelIndex &topLeft,
+                        const QModelIndex &bottomRight,
+                        const QList<int> &changedRoles) {
+              if (row < topLeft.row() || row > bottomRight.row())
+                  return;
 
-                    update(changedRoles);
-                });
+              update(changedRoles);
+          },
+          Qt::QueuedConnection);
+        connect(&this->chooser, &EventDelegateChooser::destroyed, obj, [connection]() {
+            QObject::disconnect(connection);
+        });
     }
 }