summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/plugins/qt4projectmanager/qt4project.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/qt4projectmanager/qt4project.cpp b/src/plugins/qt4projectmanager/qt4project.cpp
index bdddeeb6df..e55477bb26 100644
--- a/src/plugins/qt4projectmanager/qt4project.cpp
+++ b/src/plugins/qt4projectmanager/qt4project.cpp
@@ -847,10 +847,12 @@ void Qt4Project::setToolChainType(const QString &buildConfiguration, ProjectExpl
void Qt4Project::updateActiveRunConfiguration()
{
- if (!activeRunConfiguration()->isEnabled()) {
- foreach (QSharedPointer<RunConfiguration> runConfiguration, runConfigurations()) {
+ const QSharedPointer<RunConfiguration> activeRunConfig = activeRunConfiguration();
+ if (!activeRunConfig.isNull() && !activeRunConfig->isEnabled()) {
+ foreach (const QSharedPointer<RunConfiguration> &runConfiguration, runConfigurations()) {
if (runConfiguration->isEnabled()) {
setActiveRunConfiguration(runConfiguration);
+ break;
}
}
}