AnalyzerManager: Fix analyzer actions disabled after build error

Change-Id: I7a6d29aba5acd2eafccf8b2c2fc08cc4ed6f00f3
Task-Nr: QTCREATORBUG-6318
Reviewed-by: hjk <qthjk@ovi.com>

4 files changed, 4 insertions, 15 deletions

diff --git a/src/plugins/analyzerbase/analyzermanager.cpp b/src/plugins/analyzerbase/analyzermanager.cpp
index 8333c8dbad..42a8f487fb 100644
--- a/src/plugins/analyzerbase/analyzermanager.cpp
+++ b/src/plugins/analyzerbase/analyzermanager.cpp
@@ -509,8 +509,6 @@ void AnalyzerManagerPrivate::startLocalTool(IAnalyzerTool *tool, StartMode)
                 buildType = buildConfig->buildType();
         }
     }
-    if (!runConfig || !runConfig->isEnabled())
-        return;
 
     IAnalyzerTool::ToolMode toolMode = tool->toolMode();
 
@@ -558,9 +556,7 @@ void AnalyzerManagerPrivate::startLocalTool(IAnalyzerTool *tool, StartMode)
             return;
     }
 
-    m_isRunning = true;
     pe->runProject(pro, tool->id());
-    updateRunActions();
 }
 
 void AnalyzerManagerPrivate::startTool()
@@ -703,13 +699,11 @@ void AnalyzerManagerPrivate::addTool(IAnalyzerTool *tool, const StartModes &mode
 void AnalyzerManagerPrivate::handleToolStarted()
 {
     m_isRunning = true; // FIXME: Make less global.
-    updateRunActions();
 }
 
 void AnalyzerManagerPrivate::handleToolFinished()
 {
     m_isRunning = false;
-    updateRunActions();
 }
 
 void AnalyzerManagerPrivate::loadToolSettings(IAnalyzerTool *tool)
@@ -759,7 +753,7 @@ void AnalyzerManagerPrivate::updateRunActions()
     m_toolBox->setEnabled(!m_isRunning);
     m_stopAction->setEnabled(m_isRunning);
     foreach (QAction *action, m_actions)
-        action->setEnabled(!m_isRunning);
+        action->setEnabled(startEnabled);
 }
 
 void AnalyzerManagerPrivate::onCurrentProjectChanged(Project *project)
diff --git a/src/plugins/analyzerbase/analyzerruncontrol.cpp b/src/plugins/analyzerbase/analyzerruncontrol.cpp
index 7dc5836b58..d845ee5ef0 100644
--- a/src/plugins/analyzerbase/analyzerruncontrol.cpp
+++ b/src/plugins/analyzerbase/analyzerruncontrol.cpp
@@ -94,7 +94,6 @@ AnalyzerRunControl::AnalyzerRunControl(IAnalyzerTool *tool,
             SLOT(addTask(ProjectExplorer::Task::TaskType,QString,QString,int)));
     connect(d->m_engine, SIGNAL(finished()),
             SLOT(engineFinished()));
-    connect(this, SIGNAL(finished()), SLOT(runControlFinished()), Qt::QueuedConnection);
 }
 
 AnalyzerRunControl::~AnalyzerRunControl()
@@ -114,6 +113,8 @@ void AnalyzerRunControl::start()
         return;
     }
 
+    AnalyzerManager::handleToolStarted();
+
     // clear about-to-be-outdated tasks
     ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance();
     TaskHub *hub = pm->getObject<TaskHub>();
@@ -145,12 +146,8 @@ void AnalyzerRunControl::stopIt()
 void AnalyzerRunControl::engineFinished()
 {
     d->m_isRunning = false;
-    emit finished();
-}
-
-void AnalyzerRunControl::runControlFinished()
-{
     AnalyzerManager::handleToolFinished();
+    emit finished();
 }
 
 bool AnalyzerRunControl::isRunning() const
diff --git a/src/plugins/analyzerbase/analyzerruncontrol.h b/src/plugins/analyzerbase/analyzerruncontrol.h
index fc6835c813..b85c78875e 100644
--- a/src/plugins/analyzerbase/analyzerruncontrol.h
+++ b/src/plugins/analyzerbase/analyzerruncontrol.h
@@ -69,7 +69,6 @@ private slots:
                  const QString &file, int line);
 
     void engineFinished();
-    void runControlFinished();
 
 private:
     class Private;
diff --git a/src/plugins/qmlprofiler/qmlprofilerengine.cpp b/src/plugins/qmlprofiler/qmlprofilerengine.cpp
index 670bb1e418..c8bc7839d0 100644
--- a/src/plugins/qmlprofiler/qmlprofilerengine.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilerengine.cpp
@@ -199,7 +199,6 @@ bool QmlProfilerEngine::start()
         d->m_fetchingData = true;
     }
 
-    AnalyzerManager::handleToolStarted();
     emit starting(this);
     return true;
 }