mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-09 15:47:38 +02:00
Code Issues Releases Wiki Activity

* Fixed creating QPixmaps in the wrong thread.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2013-06-07 11:27:58 +02:00
parent b291788a2e
commit 21d4f2b83a
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/libtomahawk/Source.cpp
View File

@@ -57,6 +57,7 @@ Source::Source( int id, const QString& nodeId )
, m_id( id ) , m_id( id )
, m_updateIndexWhenSynced( false ) , m_updateIndexWhenSynced( false )
, m_state( DBSyncConnection::UNKNOWN ) , m_state( DBSyncConnection::UNKNOWN )
, m_avatar( 0 )
, m_avatarLoaded( false ) , m_avatarLoaded( false )
, m_cc( 0 ) , m_cc( 0 )
, m_commandCount( 0 ) , m_commandCount( 0 )
@@ -261,7 +262,12 @@ Source::avatar( TomahawkUtils::ImageMode style, const QSize& size )
} }
if ( m_avatarLoaded ) if ( m_avatarLoaded )
return m_avatar; {
if ( m_avatar )
return *m_avatar;
else
return QPixmap();
}
// Try to get the avatar from the cache // Try to get the avatar from the cache
// Hint: We store the avatar for each xmpp peer using its contactId, the dbFriendlyName is a contactId of a peer // Hint: We store the avatar for each xmpp peer using its contactId, the dbFriendlyName is a contactId of a peer
@@ -269,14 +275,16 @@ Source::avatar( TomahawkUtils::ImageMode style, const QSize& size )
QByteArray avatarBuffer = TomahawkUtils::Cache::instance()->getData( "Sources", dbFriendlyName() ).toByteArray(); QByteArray avatarBuffer = TomahawkUtils::Cache::instance()->getData( "Sources", dbFriendlyName() ).toByteArray();
if ( !avatarBuffer.isNull() ) if ( !avatarBuffer.isNull() )
{ {
tDebug() << Q_FUNC_INFO << QThread::currentThread();
QPixmap avatar; QPixmap avatar;
avatar.loadFromData( avatarBuffer ); avatar.loadFromData( avatarBuffer );
avatarBuffer.clear(); avatarBuffer.clear();
m_avatar = QPixmap( TomahawkUtils::createRoundedImage( avatar, QSize( 0, 0 ) ) ); m_avatar = new QPixmap( TomahawkUtils::createRoundedImage( avatar, QSize( 0, 0 ) ) );
return *m_avatar;
} }
return m_avatar; return QPixmap();
} }
#endif #endif

2
src/libtomahawk/Source.h
View File

@@ -171,7 +171,7 @@ private:
DBSyncConnection::State m_state; DBSyncConnection::State m_state;
QTimer m_currentTrackTimer; QTimer m_currentTrackTimer;
QPixmap m_avatar; QPixmap* m_avatar;
bool m_avatarLoaded; bool m_avatarLoaded;
QPointer<ControlConnection> m_cc; QPointer<ControlConnection> m_cc;