* Made sure to call resolve in the right thread.

src/libtomahawk/database/databaseresolver.h

@@ -20,6 +20,7 @@ public:
     virtual unsigned int preference() const { return 100; }
     virtual unsigned int timeout() const { return 2500; }
 
+public slots:
     virtual void resolve( const Tomahawk::query_ptr& query );
 
 private slots:

src/libtomahawk/resolver.h

@@ -30,13 +30,15 @@ public:
     virtual unsigned int weight() const = 0;
     virtual unsigned int preference() const { return 100; };
     virtual unsigned int timeout() const = 0;
-    virtual void resolve( const Tomahawk::query_ptr& query ) = 0;
 
     //virtual QWidget * configUI() { return 0; };
     //etc
 
     PluginAPI * api() const { return m_api; }
 
+public slots:
+    virtual void resolve( const Tomahawk::query_ptr& query ) = 0;
+
 private:
     PluginAPI * m_api;
 };

src/resolvers/qtscriptresolver.cpp

@@ -47,6 +47,13 @@ QtScriptResolver::~QtScriptResolver()
 void
 QtScriptResolver::resolve( const Tomahawk::query_ptr& query )
 {
+    if ( QThread::currentThread() != thread() )
+    {
+        qDebug() << "Reinvoking in correct thread:" << Q_FUNC_INFO;
+        QMetaObject::invokeMethod( this, "resolve", Qt::QueuedConnection, Q_ARG( Tomahawk::query_ptr, query ) );
+        return;
+    }
+
     qDebug() << Q_FUNC_INFO << query->toString();
     QString eval = QString( "resolve( '%1', '%2', '%3', '%4' );" )
                       .arg( query->id().replace( "'", "\\'" ) )

src/resolvers/qtscriptresolver.h

@@ -45,9 +45,8 @@ public:
     virtual unsigned int preference() const { return m_preference; }
     virtual unsigned int timeout() const    { return m_timeout; }
 
-    virtual void resolve( const Tomahawk::query_ptr& query );
-
 public slots:
+    virtual void resolve( const Tomahawk::query_ptr& query );
     virtual void stop();
 
 private slots:

src/resolvers/scriptresolver.h

@@ -24,13 +24,12 @@ public:
     virtual unsigned int preference() const { return m_preference; }
     virtual unsigned int timeout() const    { return m_timeout; }
 
-    virtual void resolve( const Tomahawk::query_ptr& query );
-
 signals:
     void finished();
 
 public slots:
     virtual void stop();
+    virtual void resolve( const Tomahawk::query_ptr& query );
 
 private slots:
     void readStderr();