Fix merge

11 years ago · 63252d2fc0
2 changed files with 2 additions and 2 deletions
--- a/widget/form/chatform.cpp
+++ b/widget/form/chatform.cpp
@ -505,5 +505,5 @@ void ChatForm::onAvatarRemoved(int FriendId)
				@@ -505,5 +505,5 @@ void ChatForm::onAvatarRemoved(int FriendId)
    if (FriendId != f->friendId)
        return;

-    avatarLabel->setPixmap(QPixmap(":/img/contact_dark.png"));
+    avatar->setPixmap(QPixmap(":/img/contact_dark.png"));
 }
--- a/widget/friendwidget.cpp
+++ b/widget/friendwidget.cpp
@ -210,7 +210,7 @@ void FriendWidget::onAvatarRemoved(int FriendId)
				@@ -210,7 +210,7 @@ void FriendWidget::onAvatarRemoved(int FriendId)
        return;

    isDefaultAvatar = true;
-    avatar.setPixmap(QPixmap(":img/contact.png"));
+    avatar->setPixmap(QPixmap(":img/contact.png"));
 }

 void FriendWidget::mousePressEvent(QMouseEvent *ev)