From 344130cf60ba0580a4a5487adba96ca8710ca155 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Thu, 18 Apr 2013 16:39:39 +0200 Subject: [PATCH] * Fix and saftey checks for avatar handling. --- src/libtomahawk/sip/PeerInfo.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/libtomahawk/sip/PeerInfo.cpp b/src/libtomahawk/sip/PeerInfo.cpp index 9e24657f5..d1e110eb6 100644 --- a/src/libtomahawk/sip/PeerInfo.cpp +++ b/src/libtomahawk/sip/PeerInfo.cpp @@ -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" ) ); selfPeer->setWeakRef( selfPeer.toWeakRef() ); + selfPeer->setContactId( "localpeer" ); // parent->setSelfPeer( selfPeer ); s_selfPeersBySipPlugin.insert( parent, selfPeer ); @@ -310,6 +311,7 @@ PeerInfo::setAvatar( const QPixmap& avatar ) m_avatar = 0; m_fancyAvatar = 0; + Q_ASSERT( !contactId().isEmpty() ); 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_avatarBuffer.isEmpty() ) + Q_ASSERT( !contactId().isEmpty() ); + if ( m_avatarBuffer.isEmpty() && !contactId().isEmpty() ) m_avatarBuffer = TomahawkUtils::Cache::instance()->getData( "Sources", contactId() ).toByteArray(); m_avatar = new QPixmap();