From 569c22b755948bf2388594c4b5855cb968d3f8e7 Mon Sep 17 00:00:00 2001 From: Nicolas Werner Date: Thu, 23 Jan 2020 13:54:40 +0100 Subject: [PATCH] Fix blurry avatars They accidentally used the same state key... --- src/AvatarProvider.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/AvatarProvider.cpp b/src/AvatarProvider.cpp index 89496b20..d0556f85 100644 --- a/src/AvatarProvider.cpp +++ b/src/AvatarProvider.cpp @@ -42,7 +42,7 @@ resolve(const QString &avatarUrl, int size, QObject *receiver, AvatarCallback ca return; } - auto data = cache::image(avatarUrl); + auto data = cache::image(cacheKey); if (!data.isNull()) { pixmap.loadFromData(data); avatar_cache.insert(cacheKey, pixmap); @@ -68,7 +68,8 @@ resolve(const QString &avatarUrl, int size, QObject *receiver, AvatarCallback ca http::client()->get_thumbnail( opts, - [opts, proxy = std::move(proxy)](const std::string &res, mtx::http::RequestErr err) { + [opts, cacheKey, proxy = std::move(proxy)](const std::string &res, + mtx::http::RequestErr err) { if (err) { nhlog::net()->warn("failed to download avatar: {} - ({} {})", opts.mxc_url, @@ -77,7 +78,7 @@ resolve(const QString &avatarUrl, int size, QObject *receiver, AvatarCallback ca return; } - cache::saveImage(opts.mxc_url, res); + cache::saveImage(cacheKey.toStdString(), res); emit proxy->avatarDownloaded(QByteArray(res.data(), res.size())); });