summary refs log tree commit diff
path: root/src/AvatarProvider.cpp
diff options
context:
space:
mode:
authorDeepBlueV7.X <nicolas.werner@hotmail.de>2020-09-17 07:36:37 +0200
committerGitHub <noreply@github.com>2020-09-17 07:36:37 +0200
commitc62db00e6f440b4dbd9f257618e5040164bf10f1 (patch)
treee55bf8fcce1dc1af585c1116a6f87caa1d428d44 /src/AvatarProvider.cpp
parentMerge pull request #283 from trilene/voip (diff)
parentActually use room account data (diff)
downloadnheko-c62db00e6f440b4dbd9f257618e5040164bf10f1.tar.xz
Merge pull request #284 from Nheko-Reborn/hidden-events
Hidden events backend
Diffstat (limited to 'src/AvatarProvider.cpp')
-rw-r--r--src/AvatarProvider.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/AvatarProvider.cpp b/src/AvatarProvider.cpp

index 603bb71a..b1751c33 100644 --- a/src/AvatarProvider.cpp +++ b/src/AvatarProvider.cpp
@@ -34,10 +34,12 @@ resolve(const QString &avatarUrl, int size, QObject *receiver, AvatarCallback ca { const auto cacheKey = QString("%1_size_%2").arg(avatarUrl).arg(size); - if (avatarUrl.isEmpty()) + QPixmap pixmap; + if (avatarUrl.isEmpty()) { + callback(pixmap); return; + } - QPixmap pixmap; if (avatar_cache.find(cacheKey, &pixmap)) { callback(pixmap); return; @@ -75,11 +77,10 @@ resolve(const QString &avatarUrl, int size, QObject *receiver, AvatarCallback ca opts.mxc_url, mtx::errors::to_string(err->matrix_error.errcode), err->matrix_error.error); - return; + } else { + cache::saveImage(cacheKey.toStdString(), res); } - cache::saveImage(cacheKey.toStdString(), res); - emit proxy->avatarDownloaded(QByteArray(res.data(), res.size())); }); }