From 0a26584b986f8c667e919a0ca4fe1b2708a9941a Mon Sep 17 00:00:00 2001 From: Jeff Mitchell Date: Wed, 18 May 2011 11:50:03 -0400 Subject: [PATCH] Remove overzealous assert -- it's nice to assume that you'll never be passed invalid data, but nicer to assume you will :-) --- src/libtomahawk/sip/SipHandler.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/libtomahawk/sip/SipHandler.cpp b/src/libtomahawk/sip/SipHandler.cpp index 167a288cb..022dc15a6 100644 --- a/src/libtomahawk/sip/SipHandler.cpp +++ b/src/libtomahawk/sip/SipHandler.cpp @@ -70,7 +70,7 @@ const QPixmap SipHandler::avatar( const QString& name ) const { qDebug() << Q_FUNC_INFO << "Getting avatar" << name << m_usernameAvatars.keys(); - if( m_usernameAvatars.keys().contains( name ) ) + if( m_usernameAvatars.contains( name ) ) { qDebug() << Q_FUNC_INFO << "Getting avatar and avatar != null "; Q_ASSERT(!m_usernameAvatars.value( name ).isNull()); @@ -601,8 +601,12 @@ SipHandler::onStateChanged( SipPlugin::ConnectionState state ) void SipHandler::onAvatarReceived( const QString& from, const QPixmap& avatar ) { - qDebug() << Q_FUNC_INFO << "Set avatar on source for " << from; - Q_ASSERT(!avatar.isNull()); + qDebug() << Q_FUNC_INFO << " setting avatar on source for " << from; + if ( avatar.isNull() ) + { + qDebug() << Q_FUNC_INFO << " got null pixmap, not adding anything"; + return; + } m_usernameAvatars.insert( from, avatar );