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

Remove overzealous assert -- it's nice to assume that you'll never be passed invalid data, but nicer to assume you will :-)

Browse Source
This commit is contained in:
Jeff Mitchell
2011-05-18 11:50:03 -04:00
parent 3cee48dc15
commit 0a26584b98
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/libtomahawk/sip/SipHandler.cpp
View File

@@ -70,7 +70,7 @@ const QPixmap
SipHandler::avatar( const QString& name ) const SipHandler::avatar( const QString& name ) const
{ {
qDebug() << Q_FUNC_INFO << "Getting avatar" << name << m_usernameAvatars.keys(); 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 "; qDebug() << Q_FUNC_INFO << "Getting avatar and avatar != null ";
Q_ASSERT(!m_usernameAvatars.value( name ).isNull()); Q_ASSERT(!m_usernameAvatars.value( name ).isNull());
@@ -601,8 +601,12 @@ SipHandler::onStateChanged( SipPlugin::ConnectionState state )
void void
SipHandler::onAvatarReceived( const QString& from, const QPixmap& avatar ) SipHandler::onAvatarReceived( const QString& from, const QPixmap& avatar )
{ {
qDebug() << Q_FUNC_INFO << "Set avatar on source for " << from; qDebug() << Q_FUNC_INFO << " setting avatar on source for " << from;
Q_ASSERT(!avatar.isNull()); if ( avatar.isNull() )
{
qDebug() << Q_FUNC_INFO << " got null pixmap, not adding anything";
return;
}
m_usernameAvatars.insert( from, avatar ); m_usernameAvatars.insert( from, avatar );