mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-06 14:16:32 +02:00
Code Issues Releases Wiki Activity

* Fix and saftey checks for avatar handling.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2013-04-18 16:39:39 +02:00
parent 6c19cf7bd1
commit 344130cf60
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -57,6 +57,7 @@ PeerInfo::getSelf( SipPlugin* parent, PeerInfo::GetOptions options )
peerinfo_ptr selfPeer( new PeerInfo( parent, "local peerinfo don't use this id for anything" ) ); peerinfo_ptr selfPeer( new PeerInfo( parent, "local peerinfo don't use this id for anything" ) );
selfPeer->setWeakRef( selfPeer.toWeakRef() ); selfPeer->setWeakRef( selfPeer.toWeakRef() );
selfPeer->setContactId( "localpeer" );
// parent->setSelfPeer( selfPeer ); // parent->setSelfPeer( selfPeer );
s_selfPeersBySipPlugin.insert( parent, selfPeer ); s_selfPeersBySipPlugin.insert( parent, selfPeer );
@@ -310,6 +311,7 @@ PeerInfo::setAvatar( const QPixmap& avatar )
m_avatar = 0; m_avatar = 0;
m_fancyAvatar = 0; m_fancyAvatar = 0;
Q_ASSERT( !contactId().isEmpty() );
TomahawkUtils::Cache::instance()->putData( "Sources", 7776000000 /* 90 days */, contactId(), ba ); TomahawkUtils::Cache::instance()->putData( "Sources", 7776000000 /* 90 days */, contactId(), ba );
} }
@@ -319,7 +321,8 @@ PeerInfo::avatar( TomahawkUtils::ImageMode style, const QSize& size ) const
{ {
if ( !m_avatar ) if ( !m_avatar )
{ {
if ( m_avatarBuffer.isEmpty() ) Q_ASSERT( !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();
m_avatar = new QPixmap(); m_avatar = new QPixmap();