From d0ccbf4416473bbb47c54f09b5af3a7993e23ee5 Mon Sep 17 00:00:00 2001 From: Jeff Mitchell Date: Thu, 12 May 2011 10:38:16 -0400 Subject: [PATCH] Fix crash in jreen and others by not processing events in infosystem's destructor. Instead, sleep for only 50ms at a time. --- src/libtomahawk/infosystem/infosystem.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/libtomahawk/infosystem/infosystem.cpp b/src/libtomahawk/infosystem/infosystem.cpp index 848d02553..d0ca69cfa 100644 --- a/src/libtomahawk/infosystem/infosystem.cpp +++ b/src/libtomahawk/infosystem/infosystem.cpp @@ -90,8 +90,7 @@ InfoSystem::~InfoSystem() while( !m_worker.isNull() ) { qDebug() << Q_FUNC_INFO << " worker not deleted, processing events"; - QCoreApplication::processEvents( QEventLoop::AllEvents, 200 ); - TomahawkUtils::Sleep::msleep( 100 ); + TomahawkUtils::Sleep::msleep( 50 ); } if ( m_infoSystemWorkerThreadController ) @@ -102,8 +101,7 @@ InfoSystem::~InfoSystem() while( !m_infoSystemWorkerThreadController->isFinished() ) { qDebug() << Q_FUNC_INFO << " worker thread controller not finished, processing events"; - QCoreApplication::processEvents( QEventLoop::AllEvents, 200 ); - TomahawkUtils::Sleep::msleep( 100 ); + TomahawkUtils::Sleep::msleep( 50 ); } delete m_infoSystemWorkerThreadController; @@ -119,8 +117,7 @@ InfoSystem::~InfoSystem() while( !m_cache.isNull() ) { qDebug() << Q_FUNC_INFO << " worker not deleted, processing events"; - QCoreApplication::processEvents( QEventLoop::AllEvents, 200 ); - TomahawkUtils::Sleep::msleep( 100 ); + TomahawkUtils::Sleep::msleep( 50 ); } if ( m_infoSystemCacheThreadController ) @@ -131,8 +128,7 @@ InfoSystem::~InfoSystem() while( !m_infoSystemCacheThreadController->isFinished() ) { qDebug() << Q_FUNC_INFO << " worker thread controller not finished, processing events"; - QCoreApplication::processEvents( QEventLoop::AllEvents, 200 ); - TomahawkUtils::Sleep::msleep( 100 ); + TomahawkUtils::Sleep::msleep( 50 ); } delete m_infoSystemCacheThreadController;