mirror of
https://github.com/tomahawk-player/tomahawk.git
synced 2025-08-06 14:16:32 +02:00
Remove overzealous assert -- it's nice to assume that you'll never be passed invalid data, but nicer to assume you will :-)
This commit is contained in:
@@ -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 );
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user