Make connections across threads queued in any case

src/ChatPage.cpp

@@ -545,8 +545,12 @@ ChatPage::ChatPage(QSharedPointer<UserSettings> userSettings, QWidget *parent)
                                   emit notificationsRetrieved(std::move(res));
                           });
         });
-        connect(this, &ChatPage::syncRoomlist, room_list_, &RoomList::sync);
-        connect(this, &ChatPage::syncTags, communitiesList_, &CommunitiesList::syncTags);
+        connect(this, &ChatPage::syncRoomlist, room_list_, &RoomList::sync, Qt::QueuedConnection);
+        connect(this,
+                &ChatPage::syncTags,
+                communitiesList_,
+                &CommunitiesList::syncTags,
+                Qt::QueuedConnection);
         connect(
           this, &ChatPage::syncTopBar, this, [this](const std::map<QString, RoomInfo> &updates) {
                   if (updates.find(currentRoom()) != updates.end())
@@ -561,11 +565,15 @@ ChatPage::ChatPage(QSharedPointer<UserSettings> userSettings, QWidget *parent)
                 user_info_widget_->setDisplayName(name);
         });
 
-        connect(this, &ChatPage::tryInitialSyncCb, this, &ChatPage::tryInitialSync);
-        connect(this, &ChatPage::trySyncCb, this, &ChatPage::trySync);
-        connect(this, &ChatPage::tryDelayedSyncCb, this, [this]() {
-                QTimer::singleShot(RETRY_TIMEOUT, this, &ChatPage::trySync);
-        });
+        connect(
+          this, &ChatPage::tryInitialSyncCb, this, &ChatPage::tryInitialSync, Qt::QueuedConnection);
+        connect(this, &ChatPage::trySyncCb, this, &ChatPage::trySync, Qt::QueuedConnection);
+        connect(
+          this,
+          &ChatPage::tryDelayedSyncCb,
+          this,
+          [this]() { QTimer::singleShot(RETRY_TIMEOUT, this, &ChatPage::trySync); },
+          Qt::QueuedConnection);
 
         connect(this, &ChatPage::dropToLoginPageCb, this, &ChatPage::dropToLoginPage);
 

src/timeline/TimelineModel.cpp

@@ -144,14 +144,26 @@ TimelineModel::TimelineModel(TimelineViewManager *manager, QString room_id, QObj
   , room_id_(room_id)
   , manager_(manager)
 {
+        connect(this,
+                &TimelineModel::oldMessagesRetrieved,
+                this,
+                &TimelineModel::addBackwardsEvents,
+                Qt::QueuedConnection);
         connect(
-          this, &TimelineModel::oldMessagesRetrieved, this, &TimelineModel::addBackwardsEvents);
-        connect(this, &TimelineModel::messageFailed, this, [this](QString txn_id) {
+          this,
+          &TimelineModel::messageFailed,
+          this,
+          [this](QString txn_id) {
                   nhlog::ui()->error("Failed to send {}, retrying", txn_id.toStdString());
 
                   QTimer::singleShot(5000, this, [this]() { emit nextPendingMessage(); });
-        });
-        connect(this, &TimelineModel::messageSent, this, [this](QString txn_id, QString event_id) {
+          },
+          Qt::QueuedConnection);
+        connect(
+          this,
+          &TimelineModel::messageSent,
+          this,
+          [this](QString txn_id, QString event_id) {
                   pending.removeOne(txn_id);
 
                   auto ev = events.value(txn_id);
@@ -191,25 +203,37 @@ TimelineModel::TimelineModel(TimelineViewManager *manager, QString room_id, QObj
 
                   if (pending.size() > 0)
                           emit nextPendingMessage();
-        });
-        connect(this, &TimelineModel::redactionFailed, this, [](const QString &msg) {
-                emit ChatPage::instance()->showNotification(msg);
-        });
-
+          },
+          Qt::QueuedConnection);
         connect(
-          this, &TimelineModel::nextPendingMessage, this, &TimelineModel::processOnePendingMessage);
-        connect(this, &TimelineModel::newMessageToSend, this, &TimelineModel::addPendingMessage);
+          this,
+          &TimelineModel::redactionFailed,
+          this,
+          [](const QString &msg) { emit ChatPage::instance()->showNotification(msg); },
+          Qt::QueuedConnection);
 
         connect(this,
+                &TimelineModel::nextPendingMessage,
+                this,
+                &TimelineModel::processOnePendingMessage,
+                Qt::QueuedConnection);
+        connect(this,
+                &TimelineModel::newMessageToSend,
+                this,
+                &TimelineModel::addPendingMessage,
+                Qt::QueuedConnection);
+
+        connect(
+          this,
           &TimelineModel::eventFetched,
           this,
           [this](QString requestingEvent, mtx::events::collections::TimelineEvents event) {
-                        events.insert(QString::fromStdString(mtx::accessors::event_id(event)),
-                                      event);
+                  events.insert(QString::fromStdString(mtx::accessors::event_id(event)), event);
                   auto idx = idToIndex(requestingEvent);
                   if (idx >= 0)
                           emit dataChanged(index(idx, 0), index(idx, 0));
-                });
+          },
+          Qt::QueuedConnection);
 }
 
 QHash<int, QByteArray>