mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-11 00:24:12 +02:00
Code Issues Releases Wiki Activity

* Fixed mutex deadlock in SourceList.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2011-08-27 21:46:13 +02:00
parent 50bce627a8
commit 33a63a45e8
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/libtomahawk/sourcelist.cpp
View File

@@ -83,15 +83,17 @@ SourceList::loadSources()
void void
SourceList::setSources( const QList<Tomahawk::source_ptr>& sources ) SourceList::setSources( const QList<Tomahawk::source_ptr>& sources )
{ {
QMutexLocker lock( &m_mut );
m_isReady = true;
foreach( const source_ptr& src, sources )
{ {
add( src ); QMutexLocker lock( &m_mut );
}
tLog() << Q_FUNC_INFO << "- Total sources now:" << m_sources.size(); m_isReady = true;
foreach( const source_ptr& src, sources )
{
add( src );
}
tLog() << Q_FUNC_INFO << "- Total sources now:" << m_sources.size();
}
emit ready(); emit ready();
} }

6
src/libtomahawk/widgets/RecentPlaylistsModel.cpp
View File

@@ -36,11 +36,7 @@ RecentPlaylistsModel::RecentPlaylistsModel( unsigned int maxPlaylists, QObject*
: QAbstractListModel( parent ) : QAbstractListModel( parent )
, m_maxPlaylists( maxPlaylists ) , m_maxPlaylists( maxPlaylists )
{ {
connect( SourceList::instance(), SIGNAL( ready() ), SLOT( onReady() ) );
if ( Servent::instance()->isReady() )
onReady();
else
connect( Servent::instance(), SIGNAL( ready() ), this, SLOT( onReady() ) );
// Load recent playlists initially // Load recent playlists initially
refresh(); refresh();