Merge pull request #284 from PhenomRetroShare/Fix_CannotUpdateAvatarError

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

View File

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