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

* Fixed InfoSystem DTOR freezing.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2011-05-29 11:22:08 +02:00
parent c24e90c978
commit 635c490924
1 changed files with 13 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/libtomahawk/infosystem/infosystem.cpp
View File

@@ -86,55 +86,24 @@ InfoSystem::~InfoSystem()
if ( !m_worker.isNull() ) if ( !m_worker.isNull() )
{ {
QMetaObject::invokeMethod( m_worker.data(), "deleteLater", Qt::QueuedConnection ); m_worker.clear();
while( !m_worker.isNull() )
{
qDebug() << Q_FUNC_INFO << " worker not deleted, processing events";
TomahawkUtils::Sleep::msleep( 50 );
}
if ( m_infoSystemWorkerThreadController )
m_infoSystemWorkerThreadController->quit(); m_infoSystemWorkerThreadController->quit();
m_infoSystemWorkerThreadController->wait( 60000 );
if( m_infoSystemWorkerThreadController )
{
while( !m_infoSystemWorkerThreadController->isFinished() )
{
qDebug() << Q_FUNC_INFO << " worker thread controller not finished, processing events";
TomahawkUtils::Sleep::msleep( 50 );
}
delete m_infoSystemWorkerThreadController; delete m_infoSystemWorkerThreadController;
m_infoSystemWorkerThreadController = 0; m_infoSystemWorkerThreadController = 0;
} }
}
qDebug() << Q_FUNC_INFO << " done deleting worker"; qDebug() << Q_FUNC_INFO << " done deleting worker";
if ( !m_cache.isNull() ) if ( !m_cache.isNull() )
{ {
QMetaObject::invokeMethod( m_cache.data(), "deleteLater", Qt::QueuedConnection ); m_cache.clear();
while( !m_cache.isNull() )
{
qDebug() << Q_FUNC_INFO << " worker not deleted, processing events";
TomahawkUtils::Sleep::msleep( 50 );
}
if ( m_infoSystemCacheThreadController )
m_infoSystemCacheThreadController->quit(); m_infoSystemCacheThreadController->quit();
m_infoSystemCacheThreadController->wait( 60000 );
if( m_infoSystemCacheThreadController )
{
while( !m_infoSystemCacheThreadController->isFinished() )
{
qDebug() << Q_FUNC_INFO << " worker thread controller not finished, processing events";
TomahawkUtils::Sleep::msleep( 50 );
}
delete m_infoSystemCacheThreadController; delete m_infoSystemCacheThreadController;
m_infoSystemCacheThreadController = 0; m_infoSystemCacheThreadController = 0;
} }
}
qDebug() << Q_FUNC_INFO << " done deleting cache"; qDebug() << Q_FUNC_INFO << " done deleting cache";
} }