forked from qt-creator/qt-creator
setStartupProject(0) now works as it should
Remove code that tries to be clever, I'm pretty sure it's better this way.
This commit is contained in:
@@ -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()
|
||||
|
||||
Reference in New Issue
Block a user