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

SessionManager: Improve handling of unconfigured projects in sessions

Browse Source 
Force Project Mode if the startup project is in need to be configured after
a session is loaded.

Task-number: QTCREATORBUG-15228
Change-Id: I625a9485c5233ff717be20fd2c14c85a3b9275e3
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2015-11-12 14:02:20 +01:00
parent 073542bb24
commit 727523ffc9
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/projectexplorer/session.cpp
View File

@@ -1062,6 +1062,8 @@ bool SessionManager::loadSession(const QString &session)
// retrieve all values before the following code could change them again // retrieve all values before the following code could change them again
Id modeId = Id::fromSetting(value(QLatin1String("ActiveMode"))); Id modeId = Id::fromSetting(value(QLatin1String("ActiveMode")));
if (!modeId.isValid())
modeId = Id(Core::Constants::MODE_EDIT);
QColor c = QColor(reader.restoreValue(QLatin1String("Color")).toString()); QColor c = QColor(reader.restoreValue(QLatin1String("Color")).toString());
if (c.isValid()) if (c.isValid())
@@ -1083,9 +1085,10 @@ bool SessionManager::loadSession(const QString &session)
d->m_future.reportFinished(); d->m_future.reportFinished();
d->m_future = QFutureInterface<void>(); d->m_future = QFutureInterface<void>();
// restore the active mode // Fall back to Project mode if the startup project is unconfigured and
if (!modeId.isValid()) // use the mode saved in the session otherwise
modeId = Id(Core::Constants::MODE_EDIT); if (d->m_startupProject && d->m_startupProject->needsConfiguration())
modeId = Id(Constants::MODE_SESSION);
ModeManager::activateMode(modeId); ModeManager::activateMode(modeId);
ModeManager::setFocusToCurrentMode(); ModeManager::setFocusToCurrentMode();