From d51edeaf512fd3130fd6d74927763c96fba922f4 Mon Sep 17 00:00:00 2001 From: Daniel Teske Date: Tue, 8 May 2012 17:41:08 +0200 Subject: [PATCH] Fix "Projects mode" looking broken if the startup project is "wrong" E.g. this could happen if a session with two projects is opened, where the startup project no longer exists. Change-Id: I1c60bacb62b5f39f7830a3bc30e3aa388a825884 Reviewed-by: Tobias Hunger --- src/plugins/projectexplorer/session.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/plugins/projectexplorer/session.cpp b/src/plugins/projectexplorer/session.cpp index b3263a0a02f..770314d4b5d 100644 --- a/src/plugins/projectexplorer/session.cpp +++ b/src/plugins/projectexplorer/session.cpp @@ -748,15 +748,17 @@ void SessionManager::restoreStartupProject(const Utils::PersistentSettingsReader { const QString startupProject = reader.restoreValue(QLatin1String("StartupProject")).toString(); if (!startupProject.isEmpty()) { - const QString startupProjectPath = startupProject; foreach (Project *pro, m_projects) { - if (QDir::cleanPath(pro->document()->fileName()) == startupProjectPath) { + if (QDir::cleanPath(pro->document()->fileName()) == startupProject) { setStartupProject(pro); break; } } - if (!m_startupProject) - qWarning() << "Could not find startup project" << startupProjectPath; + } + if (!m_startupProject) { + qWarning() << "Could not find startup project" << startupProject; + if (!projects().isEmpty()) + setStartupProject(projects().first()); } }