From 3e0c6e3ce36bc2f29a92d78443925066b5772fba Mon Sep 17 00:00:00 2001
From: dt <qtc-committer@nokia.com>
Date: Fri, 26 Mar 2010 14:06:54 +0100
Subject: [PATCH] setStartupProject(0) now works as it should
Remove code that tries to be clever, I'm pretty sure it's better this
way.
---
src/plugins/projectexplorer/projectexplorer.cpp | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index ea5d2727f4d..201c84ac394 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -948,12 +948,9 @@ void ProjectExplorerPlugin::setStartupProject(Project *project)
if (debug)
qDebug() << "ProjectExplorerPlugin::setStartupProject";
- if (!project)
- project = d->m_currentProject;
if (!project)
return;
d->m_session->setStartupProject(project);
- // NPE: Visually mark startup project
updateActions();
}
@@ -1114,12 +1111,7 @@ Project *ProjectExplorerPlugin::startupProject() const
if (debug)
qDebug() << "ProjectExplorerPlugin::startupProject";
- Project *pro = d->m_session->startupProject();
-
- if (!pro)
- pro = d->m_currentProject;
-
- return pro;
+ return d->m_session->startupProject();
}
void ProjectExplorerPlugin::updateWelcomePage()
--
GitLab