Commit ba71b3e9 authored by Kai Koehne's avatar Kai Koehne Committed by hjk
Browse files

Analyzer: Fix soft assert on startup



Fix "SOFT ASSERT: str && *str" when using the analyzer for the
first time / with nuked settings.

Change-Id: Id6f0fc8031fc8d8a24d6d4c0badfbfbdc98974a9
Reviewed-by: default avatarhjk <qthjk@ovi.com>
parent 0a556c2f
...@@ -580,6 +580,8 @@ QAction *AnalyzerManagerPrivate::actionFromToolAndMode(IAnalyzerTool *tool, Star ...@@ -580,6 +580,8 @@ QAction *AnalyzerManagerPrivate::actionFromToolAndMode(IAnalyzerTool *tool, Star
void AnalyzerManagerPrivate::selectSavedTool() void AnalyzerManagerPrivate::selectSavedTool()
{ {
const QSettings *settings = ICore::settings(); const QSettings *settings = ICore::settings();
if (settings->contains(QLatin1String(LAST_ACTIVE_TOOL))) {
const Id lastActiveAction(settings->value(QLatin1String(LAST_ACTIVE_TOOL)).toString()); const Id lastActiveAction(settings->value(QLatin1String(LAST_ACTIVE_TOOL)).toString());
foreach (QAction *action, m_actions) { foreach (QAction *action, m_actions) {
IAnalyzerTool *tool = m_toolFromAction.value(action); IAnalyzerTool *tool = m_toolFromAction.value(action);
...@@ -589,6 +591,7 @@ void AnalyzerManagerPrivate::selectSavedTool() ...@@ -589,6 +591,7 @@ void AnalyzerManagerPrivate::selectSavedTool()
return; return;
} }
} }
}
// fallback to first available tool // fallback to first available tool
if (!m_actions.isEmpty()) { if (!m_actions.isEmpty()) {
IAnalyzerTool *tool = m_toolFromAction.value(m_actions.first()); IAnalyzerTool *tool = m_toolFromAction.value(m_actions.first());
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment