From 38c7f981cca6de68f0b7cb995fcee5857c27f4e9 Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Wed, 6 Jul 2011 14:41:16 +0200
Subject: [PATCH] analyzer: postpone selecting saved tool
... until the analyze mode is actually selected
Change-Id: I7d03c48a4b4260d54bf3218b3a493ceacd2d2967
Reviewed-on: http://codereview.qt.nokia.com/1243
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
---
src/plugins/analyzerbase/analyzermanager.cpp | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/plugins/analyzerbase/analyzermanager.cpp b/src/plugins/analyzerbase/analyzermanager.cpp
index 571a1ee8357..d3c6daa241a 100644
--- a/src/plugins/analyzerbase/analyzermanager.cpp
+++ b/src/plugins/analyzerbase/analyzermanager.cpp
@@ -553,7 +553,16 @@ void AnalyzerManagerPrivate::startTool()
void AnalyzerManagerPrivate::modeChanged(IMode *mode)
{
- m_mainWindow->setDockActionsVisible(mode == m_mode);
+ if (mode && mode == m_mode) {
+ m_mainWindow->setDockActionsVisible(true);
+ static bool firstTime = true;
+ if (firstTime)
+ selectSavedTool();
+ firstTime = false;
+ updateRunActions();
+ } else {
+ m_mainWindow->setDockActionsVisible(false);
+ }
}
QAction *AnalyzerManagerPrivate::actionFromToolAndMode(IAnalyzerTool *tool, StartMode mode)
@@ -781,7 +790,6 @@ void AnalyzerManager::extensionsInitialized()
foreach (IAnalyzerTool *tool, d->m_tools)
tool->extensionsInitialized();
- d->selectSavedTool();
}
void AnalyzerManager::shutdown()
--
GitLab