Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-02 11:16:34 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #284 from PhenomRetroShare/Fix_CannotUpdateAvatarError

Browse source 
Fix "(EE) cannot update avatar. mId has unhandled type." error.
This commit is contained in:
Thunder 2016-02-17 20:23:44 +01:00
commit b059a8eb3f
1 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
retroshare-gui/src/gui/common/AvatarWidget.cpp
View file

@ -247,13 +247,18 @@ void AvatarWidget::updateStatus(int status)
void AvatarWidget::updateAvatar(const QString &peerId) void AvatarWidget::updateAvatar(const QString &peerId)
{ {
if(mId.isPeerId() && mId.toPeerId() == RsPeerId(peerId.toStdString())) if(mId.isPeerId()){
if(mId.toPeerId() == RsPeerId(peerId.toStdString()))
refreshAvatarImage() ; refreshAvatarImage() ;
else if(mId.isDistantChatId() && mId.toDistantChatId() == DistantChatPeerId(peerId.toStdString())) //else not mId so pass through
} else if(mId.isDistantChatId()) {
if (mId.toDistantChatId() == DistantChatPeerId(peerId.toStdString()))
refreshAvatarImage() ; refreshAvatarImage() ;
else //else not mId so pass through
} else
std::cerr << "(EE) cannot update avatar. mId has unhandled type." << std::endl; std::cerr << "(EE) cannot update avatar. mId has unhandled type." << std::endl;
} }
void AvatarWidget::refreshAvatarImage() void AvatarWidget::refreshAvatarImage()
{ {
if (mGxsId.isNull()==false) if (mGxsId.isNull()==false)