mirror of
https://github.com/tomahawk-player/tomahawk.git
synced 2025-08-11 00:24:12 +02:00
* More InfoSystem DTOR fixes.
This commit is contained in:
@@ -86,10 +86,10 @@ InfoSystem::~InfoSystem()
|
|||||||
|
|
||||||
if ( !m_worker.isNull() )
|
if ( !m_worker.isNull() )
|
||||||
{
|
{
|
||||||
m_worker.clear();
|
|
||||||
m_infoSystemWorkerThreadController->quit();
|
m_infoSystemWorkerThreadController->quit();
|
||||||
m_infoSystemWorkerThreadController->wait( 60000 );
|
m_infoSystemWorkerThreadController->wait( 60000 );
|
||||||
|
|
||||||
|
delete m_worker.data();
|
||||||
delete m_infoSystemWorkerThreadController;
|
delete m_infoSystemWorkerThreadController;
|
||||||
m_infoSystemWorkerThreadController = 0;
|
m_infoSystemWorkerThreadController = 0;
|
||||||
}
|
}
|
||||||
@@ -97,10 +97,10 @@ InfoSystem::~InfoSystem()
|
|||||||
|
|
||||||
if ( !m_cache.isNull() )
|
if ( !m_cache.isNull() )
|
||||||
{
|
{
|
||||||
m_cache.clear();
|
|
||||||
m_infoSystemCacheThreadController->quit();
|
m_infoSystemCacheThreadController->quit();
|
||||||
m_infoSystemCacheThreadController->wait( 60000 );
|
m_infoSystemCacheThreadController->wait( 60000 );
|
||||||
|
|
||||||
|
delete m_cache.data();
|
||||||
delete m_infoSystemCacheThreadController;
|
delete m_infoSystemCacheThreadController;
|
||||||
m_infoSystemCacheThreadController = 0;
|
m_infoSystemCacheThreadController = 0;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user