From 63252d2fc0984b16aeee42fa54a3af26e61c1389 Mon Sep 17 00:00:00 2001
From: "Tux3 / Mlkj / !Lev.uXFMLA" <barrdetwix@gmail.com>
Date: Sat, 27 Sep 2014 20:21:56 +0200
Subject: [PATCH] Fix merge

---
 widget/form/chatform.cpp | 2 +-
 widget/friendwidget.cpp  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/widget/form/chatform.cpp b/widget/form/chatform.cpp
index dc8b7bf05..a200eff08 100644
--- a/widget/form/chatform.cpp
+++ b/widget/form/chatform.cpp
@@ -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"));
 }
diff --git a/widget/friendwidget.cpp b/widget/friendwidget.cpp
index 7b09c2b95..5bce871f7 100644
--- a/widget/friendwidget.cpp
+++ b/widget/friendwidget.cpp
@@ -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)