thek0tyara/nheko
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't read avatarUrl from local profile, if no global avatar is set

Browse source
This commit is contained in:
Nicolas Werner 2021-06-12 16:05:45 +02:00
parent 7d5e82c888
commit e6878ee298
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9
3 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/ui/UserProfile.cpp
View file

@ -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