feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

setStartupProject(0) now works as it should

Browse Source 
Remove code that tries to be clever, I'm pretty sure it's better this
way.
This commit is contained in:
dt
2010-03-26 14:06:54 +01:00
parent 8418e6c038
commit 3e0c6e3ce3
1 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/projectexplorer/projectexplorer.cpp
View File

@@ -948,12 +948,9 @@ void ProjectExplorerPlugin::setStartupProject(Project *project)
if (debug) if (debug)
qDebug() << "ProjectExplorerPlugin::setStartupProject"; qDebug() << "ProjectExplorerPlugin::setStartupProject";
if (!project)
project = d->m_currentProject;
if (!project) if (!project)
return; return;
d->m_session->setStartupProject(project); d->m_session->setStartupProject(project);
// NPE: Visually mark startup project
updateActions(); updateActions();
} }
@@ -1114,12 +1111,7 @@ Project *ProjectExplorerPlugin::startupProject() const
if (debug) if (debug)
qDebug() << "ProjectExplorerPlugin::startupProject"; qDebug() << "ProjectExplorerPlugin::startupProject";
Project *pro = d->m_session->startupProject(); return d->m_session->startupProject();
if (!pro)
pro = d->m_currentProject;
return pro;
} }
void ProjectExplorerPlugin::updateWelcomePage() void ProjectExplorerPlugin::updateWelcomePage()