setStartupProject(0) now works as it should

Remove code that tries to be clever, I'm pretty sure it's better this
way.

1 files changed, 1 insertions, 9 deletions

diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index ea5d2727f4..201c84ac39 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -949,11 +949,8 @@ void ProjectExplorerPlugin::setStartupProject(Project *project)
         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()