From: Claudio Cambra <claudio.cambra@nextcloud.com>
Date: Mon, 21 Oct 2024 03:10:58 +0000 (+0800)
Subject: Ensure requestedSize for avatars is valid
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~5^2~14^2~4
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3957a305c2286541bea24d55e9b9f2a4412c1af2;p=nextcloud-desktop.git

Ensure requestedSize for avatars is valid

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
---

diff --git a/src/gui/tray/usermodel.cpp b/src/gui/tray/usermodel.cpp
index 34be0660e..2679bb3ea 100644
--- a/src/gui/tray/usermodel.cpp
+++ b/src/gui/tray/usermodel.cpp
@@ -1654,7 +1654,8 @@ public:
                 qCWarning(lcActivity) << "Account not found:" << accountString;
                 return;
             }
-            const auto avatarJob = new AvatarJob(accountState->account(), avatarUserId, requestedSize.width());
+            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));
             });