mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-01 20:00:13 +02:00
Code Issues Releases Wiki Activity

* Don't try to re-load avatars.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2013-04-18 17:06:21 +02:00
parent 344130cf60
commit 1ec3a3bb70
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/libtomahawk/sip/PeerInfo.cpp
View File

@@ -321,6 +321,7 @@ PeerInfo::avatar( TomahawkUtils::ImageMode style, const QSize& size ) const
{ {
if ( !m_avatar ) if ( !m_avatar )
{ {
tDebug() << "Avatar for:" << id();
Q_ASSERT( !contactId().isEmpty() ); Q_ASSERT( !contactId().isEmpty() );
if ( m_avatarBuffer.isEmpty() && !contactId().isEmpty() ) if ( m_avatarBuffer.isEmpty() && !contactId().isEmpty() )
m_avatarBuffer = TomahawkUtils::Cache::instance()->getData( "Sources", contactId() ).toByteArray(); 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() ) if ( !m_avatarBuffer.isEmpty() )
m_avatar->loadFromData( m_avatarBuffer ); m_avatar->loadFromData( m_avatarBuffer );
if ( m_avatar->isNull() )
{
delete m_avatar;
m_avatar = 0;
}
m_avatarBuffer.clear(); m_avatarBuffer.clear();
} }
@@ -346,7 +341,7 @@ PeerInfo::avatar( TomahawkUtils::ImageMode style, const QSize& size ) const
{ {
pixmap = *m_fancyAvatar; pixmap = *m_fancyAvatar;
} }
else if ( m_avatar ) else if ( m_avatar && !m_avatar->isNull() )
{ {
pixmap = *m_avatar; pixmap = *m_avatar;
} }