From a8ad8cd774f2fd2c0710b6cb35cbb7ce9909f356 Mon Sep 17 00:00:00 2001 From: Jeff Mitchell Date: Tue, 3 May 2011 14:34:31 -0400 Subject: [PATCH] I can haz lfranchi crash fix? --- src/libtomahawk/infosystem/infosystemworker.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/libtomahawk/infosystem/infosystemworker.cpp b/src/libtomahawk/infosystem/infosystemworker.cpp index 83270f0ae..5c707de9f 100644 --- a/src/libtomahawk/infosystem/infosystemworker.cpp +++ b/src/libtomahawk/infosystem/infosystemworker.cpp @@ -167,15 +167,18 @@ InfoSystemWorker::nam() const void InfoSystemWorker::newNam() { - qDebug() << Q_FUNC_INFO; + qDebug() << Q_FUNC_INFO << " begin"; QNetworkAccessManager *oldNam = TomahawkUtils::nam(); - if ( oldNam && m_nam == oldNam ) + if ( oldNam && oldNam->thread() == thread() ) { + qDebug() << Q_FUNC_INFO << " returning old nam as it's the same thread as me"; + m_nam = oldNam; emit namChanged(); return; } + qDebug() << Q_FUNC_INFO << " no nam exists, or it's a different thread, creating a new one"; QNetworkAccessManager* newNam; #ifdef LIBLASTFM_FOUND newNam = new lastfm::NetworkAccessManager( this );