From 44173808cb7f15e1ad93ccd687c525c21833582d Mon Sep 17 00:00:00 2001
From: Jeff Mitchell <tomahawk@jefferai.org>
Date: Tue, 3 May 2011 12:36:23 -0400
Subject: [PATCH] Hopefully fix startup crash in single-threaded
 infosystemworker mode

---
 src/libtomahawk/infosystem/infosystem.cpp       |  2 +-
 src/libtomahawk/infosystem/infosystemworker.cpp | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/libtomahawk/infosystem/infosystem.cpp b/src/libtomahawk/infosystem/infosystem.cpp
index 84a15bd67..42cc425c8 100644
--- a/src/libtomahawk/infosystem/infosystem.cpp
+++ b/src/libtomahawk/infosystem/infosystem.cpp
@@ -62,7 +62,7 @@ InfoSystem::InfoSystem(QObject *parent)
 
     m_infoSystemWorkerThreadController = new QThread( this );
     m_worker = new InfoSystemWorker();
-    m_worker->moveToThread( m_infoSystemWorkerThreadController );
+    //m_worker->moveToThread( m_infoSystemWorkerThreadController );
     m_infoSystemWorkerThreadController->start();
 
     QMetaObject::invokeMethod( m_worker, "init", Qt::QueuedConnection );
diff --git a/src/libtomahawk/infosystem/infosystemworker.cpp b/src/libtomahawk/infosystem/infosystemworker.cpp
index 763e34a65..83270f0ae 100644
--- a/src/libtomahawk/infosystem/infosystemworker.cpp
+++ b/src/libtomahawk/infosystem/infosystemworker.cpp
@@ -169,6 +169,13 @@ InfoSystemWorker::newNam()
 {
     qDebug() << Q_FUNC_INFO;
 
+    QNetworkAccessManager *oldNam = TomahawkUtils::nam();
+    if ( oldNam && m_nam == oldNam )
+    {
+        emit namChanged();
+        return;
+    }
+    
     QNetworkAccessManager* newNam;
 #ifdef LIBLASTFM_FOUND
     newNam = new lastfm::NetworkAccessManager( this );
@@ -176,10 +183,8 @@ InfoSystemWorker::newNam()
     newNam = new QNetworkAccessManager( this );
 #endif
     if ( m_nam )
-    {
         delete m_nam;
-    }
-    QNetworkAccessManager *oldNam = TomahawkUtils::nam();
+
     if ( !oldNam )
     {
         m_nam = newNam;