mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-26 23:35:32 +02:00
Code Issues Releases Wiki Activity

Fix race condition on loading resolver icons & loading attica resolvers

Browse Source
This commit is contained in:
Leo Franchi
2012-09-19 16:10:33 -04:00
parent 4a7c2fd2b4
commit 9146a3961e
2 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/libtomahawk/accounts/ResolverAccount.cpp
View File

@@ -240,11 +240,9 @@ AtticaResolverAccount::AtticaResolverAccount( const QString& accountId )
{ {
TomahawkSettings::instance()->setValue( QString( "accounts/%1/atticaresolver" ).arg( accountId ), true ); TomahawkSettings::instance()->setValue( QString( "accounts/%1/atticaresolver" ).arg( accountId ), true );
init();
m_atticaId = configuration().value( "atticaId" ).toString(); m_atticaId = configuration().value( "atticaId" ).toString();
connect( AtticaManager::instance(), SIGNAL( resolverIconUpdated( QString ) ), this, SLOT( resolverIconUpdated( QString ) ) );
loadIcon();
} }
AtticaResolverAccount::AtticaResolverAccount( const QString& accountId, const QString& path, const QString& atticaId ) AtticaResolverAccount::AtticaResolverAccount( const QString& accountId, const QString& path, const QString& atticaId )
@@ -257,9 +255,7 @@ AtticaResolverAccount::AtticaResolverAccount( const QString& accountId, const QS
TomahawkSettings::instance()->setValue( QString( "accounts/%1/atticaresolver" ).arg( accountId ), true ); TomahawkSettings::instance()->setValue( QString( "accounts/%1/atticaresolver" ).arg( accountId ), true );
connect( AtticaManager::instance(), SIGNAL( resolverIconUpdated( QString ) ), this, SLOT( resolverIconUpdated( QString ) ) ); init();
loadIcon();
sync(); sync();
} }
@@ -269,6 +265,20 @@ AtticaResolverAccount::~AtticaResolverAccount()
} }
void
AtticaResolverAccount::init()
{
connect( AtticaManager::instance(), SIGNAL( resolverIconUpdated( QString ) ), this, SLOT( resolverIconUpdated( QString ) ) );
if ( AtticaManager::instance()->resolversLoaded() )
loadIcon();
else
connect( AtticaManager::instance(), SIGNAL( resolversLoaded( Attica::Content::List ) ), this, SLOT( loadIcon() ) );
}
void void
AtticaResolverAccount::loadIcon() AtticaResolverAccount::loadIcon()
{ {

3
src/libtomahawk/accounts/ResolverAccount.h
View File

@@ -122,11 +122,12 @@ public:
private slots: private slots:
void resolverIconUpdated( const QString& ); void resolverIconUpdated( const QString& );
void loadIcon();
private: private:
// Created by factory, when user installs a new resolver // Created by factory, when user installs a new resolver
AtticaResolverAccount( const QString& accountId, const QString& path, const QString& atticaId ); AtticaResolverAccount( const QString& accountId, const QString& path, const QString& atticaId );
void loadIcon(); void init();
QPixmap m_icon; QPixmap m_icon;
QString m_atticaId; QString m_atticaId;