Ensure avatarJob is run on the respective account's QNAM thread

Signed-off-by: Claudio Cambra <[email protected]>
nextcloud · Nov 20, 2024 · 13141db · 13141db
1 parent 5b5c5e3
commit 13141db
Showing 1 changed file with 13 additions and 5 deletions.
diff --git a/src/gui/tray/usermodel.cpp b/src/gui/tray/usermodel.cpp
@@ -1650,12 +1650,20 @@ class ImageResponse : public QQuickImageResponse
                 qCWarning(lcActivity) << "Invalid account:" << accountString;
                 return;
             }
-            const auto avatarSize = requestedSize.width() > 0 ? requestedSize.width() : 64;
-            const auto avatarJob = new AvatarJob(accountState->account(), avatarUserId, avatarSize);
-            connect(avatarJob, &AvatarJob::avatarPixmap, this, [&](const QImage &avatarImg) {
-                handleDone(AvatarJob::makeCircularAvatar(avatarImg));
+
+            const auto account = accountState->account();
+            const auto qnam = account->networkAccessManager();
+
+            QMetaObject::invokeMethod(qnam, [this, requestedSize, avatarUserId, account]() {
+                const auto avatarSize = requestedSize.width() > 0 ? requestedSize.width() : 64;
+                const auto avatarJob = new AvatarJob(account, avatarUserId, avatarSize);
+                connect(avatarJob, &AvatarJob::avatarPixmap, this, [&](const QImage &avatarImg) {
+                    QMetaObject::invokeMethod(this, [this, avatarImg] {
+                        handleDone(AvatarJob::makeCircularAvatar(avatarImg));
+                    });
+                });
+                avatarJob->start();
             });
-            avatarJob->start();
             return;
         }