From 1ec3a3bb7019ef498e66b3528be14a5fa44ad53d Mon Sep 17 00:00:00 2001
From: Christian Muehlhaeuser <muesli@gmail.com>
Date: Thu, 18 Apr 2013 17:06:21 +0200
Subject: [PATCH] * Don't try to re-load avatars.

---
 src/libtomahawk/sip/PeerInfo.cpp | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/libtomahawk/sip/PeerInfo.cpp b/src/libtomahawk/sip/PeerInfo.cpp
index d1e110eb6..772f6779a 100644
--- a/src/libtomahawk/sip/PeerInfo.cpp
+++ b/src/libtomahawk/sip/PeerInfo.cpp
@@ -321,6 +321,7 @@ PeerInfo::avatar( TomahawkUtils::ImageMode style, const QSize& size ) const
 {
     if ( !m_avatar )
     {
+        tDebug() << "Avatar for:" << id();
         Q_ASSERT( !contactId().isEmpty() );
         if ( m_avatarBuffer.isEmpty() && !contactId().isEmpty() )
             m_avatarBuffer = TomahawkUtils::Cache::instance()->getData( "Sources", contactId() ).toByteArray();
@@ -329,12 +330,6 @@ PeerInfo::avatar( TomahawkUtils::ImageMode style, const QSize& size ) const
         if ( !m_avatarBuffer.isEmpty() )
             m_avatar->loadFromData( m_avatarBuffer );
 
-        if ( m_avatar->isNull() )
-        {
-            delete m_avatar;
-            m_avatar = 0;
-        }
-
         m_avatarBuffer.clear();
     }
 
@@ -346,7 +341,7 @@ PeerInfo::avatar( TomahawkUtils::ImageMode style, const QSize& size ) const
     {
         pixmap = *m_fancyAvatar;
     }
-    else if ( m_avatar )
+    else if ( m_avatar && !m_avatar->isNull() )
     {
         pixmap = *m_avatar;
     }