From 68dae8bcafcad53d2460de67564c33ab129cc7d5 Mon Sep 17 00:00:00 2001
From: dt <qtc-committer@nokia.com>
Date: Mon, 30 Nov 2009 13:58:06 +0100
Subject: [PATCH] Fix crash on creating new qt4projects
---
src/plugins/projectexplorer/project.cpp | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/plugins/projectexplorer/project.cpp b/src/plugins/projectexplorer/project.cpp
index c4cdcd84fce..941cd1806fa 100644
--- a/src/plugins/projectexplorer/project.cpp
+++ b/src/plugins/projectexplorer/project.cpp
@@ -275,8 +275,16 @@ bool Project::restoreSettingsImpl(PersistentSettingsReader &reader)
}
// Set Active Configuration
- QString activeConfigurationName = reader.restoreValue("activebuildconfiguration").toString();
- m_activeBuildConfiguration = buildConfigurations().at(buildConfigurationNames.indexOf(activeConfigurationName));
+ { // Try restoring the active configuration
+ QString activeConfigurationName = reader.restoreValue("activebuildconfiguration").toString();
+ int index = buildConfigurationNames.indexOf(activeConfigurationName);
+ if (index != -1)
+ m_activeBuildConfiguration = buildConfigurations().at(index);
+ else if (!buildConfigurations().isEmpty())
+ m_activeBuildConfiguration = buildConfigurations().at(0);
+ else
+ m_activeBuildConfiguration = 0;
+ }
//Build Settings
QVariant buildStepsVariant = reader.restoreValue("buildsteps");
--
GitLab