mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-12-18 11:51:51 +03:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
This commit is contained in:
Claudio Cambra 2024-11-20 14:09:40 +08:00
parent 5b5c5e3ac7
commit 13141db2ed
No known key found for this signature in database
GPG key ID: C839200C384636B0
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/gui/tray/usermodel.cpp
View file

@ -1650,12 +1650,20 @@ public:
qCWarning(lcActivity) << "Invalid account:" << accountString; qCWarning(lcActivity) << "Invalid account:" << accountString;
return; return;
} }
const auto avatarSize = requestedSize.width() > 0 ? requestedSize.width() : 64;
const auto avatarJob = new AvatarJob(accountState->account(), avatarUserId, avatarSize); const auto account = accountState->account();
connect(avatarJob, &AvatarJob::avatarPixmap, this, [&](const QImage &avatarImg) { const auto qnam = account->networkAccessManager();
handleDone(AvatarJob::makeCircularAvatar(avatarImg));
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; return;
} }