From 3b007ef92a0702c7c7dec80a9c9b24ebce90c101 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@nokia.com>
Date: Wed, 15 Sep 2010 16:39:35 +0200
Subject: [PATCH] Keep projects that failed to load in a session

Do not throw projects that failed to load out of the session.
Remember the project file names and append them to the session
again when saving.

Reviewed-by: dt
---
 src/plugins/projectexplorer/session.cpp | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/plugins/projectexplorer/session.cpp b/src/plugins/projectexplorer/session.cpp
index fc3c3fb7610..b71ff7f8e08 100644
--- a/src/plugins/projectexplorer/session.cpp
+++ b/src/plugins/projectexplorer/session.cpp
@@ -82,6 +82,8 @@ public:
     QString fileName() const;
     void setFileName(const QString &fileName);
 
+    QStringList failedProjectFileNames() const;
+
 public slots:
     void sessionLoadingProgress();
 
@@ -91,6 +93,7 @@ private:
     QString m_fileName;
     QList<Project *> m_projects;
     Project *m_startupProject;
+    QStringList m_failedProjects;
     QMap<QString, QStringList> m_depMap;
 
     QMap<QString, QVariant> m_values;
@@ -167,8 +170,13 @@ bool SessionFile::load(const QString &fileName)
     future.setProgressValue(1);
 
     // indirectly adds projects to session
-    if (!fileList.isEmpty())
-        ProjectExplorerPlugin::instance()->openProjects(fileList);
+    // Keep projects that failed to load in the session!
+    m_failedProjects = fileList;
+    if (!fileList.isEmpty()) {
+        QList<Project *> projects = ProjectExplorerPlugin::instance()->openProjects(fileList);
+        foreach (Project *p, projects)
+            m_failedProjects.removeAll(p->file()->fileName());
+    }
 
     sessionLoadingProgress();
 
@@ -239,6 +247,8 @@ bool SessionFile::save(const QString &fileName)
     foreach (Project *pro, m_projects) {
         projectFiles << pro->file()->fileName();
     }
+    // Restore infromation on projects that failed to load:
+    projectFiles.append(m_failedProjects);
 
     writer.saveValue(QLatin1String("ProjectList"), projectFiles);
 
@@ -288,6 +298,11 @@ void SessionFile::setFileName(const QString &fileName)
     m_fileName = fileName;
 }
 
+QStringList SessionFile::failedProjectFileNames() const
+{
+    return m_failedProjects;
+}
+
 Internal::SessionNodeImpl::SessionNodeImpl(SessionManager *manager)
         : ProjectExplorer::SessionNode(manager->currentSession(), manager)
 {