diff options
| author | Nicolas Werner <nicolas.werner@hotmail.de> | 2021-06-12 16:05:45 +0200 |
|---|---|---|
| committer | Nicolas Werner <nicolas.werner@hotmail.de> | 2021-06-12 16:05:45 +0200 |
| commit | e6878ee298525ac7808595418c4b84b93788ff2e (patch) | |
| tree | 5d0b397ab8836e65963e4b542163861163b91429 /src/ui/UserProfile.cpp | |
| parent | Merge branch 'master' into qml-roomlist (diff) | |
| download | nheko-e6878ee298525ac7808595418c4b84b93788ff2e.tar.xz | |
Don't read avatarUrl from local profile, if no global avatar is set
Diffstat (limited to '')
| -rw-r--r-- | src/ui/UserProfile.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/ui/UserProfile.cpp b/src/ui/UserProfile.cpp index da130242..3d9c4b6a 100644 --- a/src/ui/UserProfile.cpp +++ b/src/ui/UserProfile.cpp @@ -39,7 +39,8 @@ UserProfile::UserProfile(QString roomid, getGlobalProfileData(); } - if (!cache::client() || !cache::client()->isDatabaseReady()) + if (!cache::client() || !cache::client()->isDatabaseReady() || + !ChatPage::instance()->timelineManager()) return; connect(cache::client(), @@ -127,10 +128,7 @@ UserProfile::displayName() QString UserProfile::avatarUrl() { - return (isGlobalUserProfile() && globalAvatarUrl != "") - ? globalAvatarUrl - : cache::avatarUrl(roomid_, userid_); - ; + return isGlobalUserProfile() ? globalAvatarUrl : cache::avatarUrl(roomid_, userid_); } bool |