From 4c8fa37d0e1ae885cec455fa55d5e1272a73b393 Mon Sep 17 00:00:00 2001 From: Leo Franchi Date: Sun, 25 Dec 2011 19:56:09 -0600 Subject: [PATCH] Delete external resolvers when removing them from resolvers list --- src/libtomahawk/pipeline.cpp | 2 +- src/libtomahawk/resolvers/scriptresolver.cpp | 2 +- src/libtomahawk/resolvers/scriptresolver.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libtomahawk/pipeline.cpp b/src/libtomahawk/pipeline.cpp index af0b271e8..73d14fce4 100644 --- a/src/libtomahawk/pipeline.cpp +++ b/src/libtomahawk/pipeline.cpp @@ -169,7 +169,7 @@ Pipeline::removeScriptResolver( const QString& scriptPath ) if ( r ) { r->stop(); - connect( r, SIGNAL( stopped() ), r, SLOT( deleteLater() ) ); + r->deleteLater(); } } diff --git a/src/libtomahawk/resolvers/scriptresolver.cpp b/src/libtomahawk/resolvers/scriptresolver.cpp index 29a259906..56d027f65 100644 --- a/src/libtomahawk/resolvers/scriptresolver.cpp +++ b/src/libtomahawk/resolvers/scriptresolver.cpp @@ -300,7 +300,7 @@ ScriptResolver::cmdExited( int code, QProcess::ExitStatus status ) if ( m_stopped ) { tLog() << "*** Script resolver stopped "; - emit stopped(); + emit terminated(); return; } diff --git a/src/libtomahawk/resolvers/scriptresolver.h b/src/libtomahawk/resolvers/scriptresolver.h index 9191396be..c7cd9a9e4 100644 --- a/src/libtomahawk/resolvers/scriptresolver.h +++ b/src/libtomahawk/resolvers/scriptresolver.h @@ -55,7 +55,7 @@ public: virtual bool running() const; signals: - void stopped(); + void terminated(); public slots: virtual void stop();