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

Session: Fix that active mode was not restored

Browse Source 
Change-Id: I3a94f1c18eb187716bfa275cfe8869c4fe046500
Task-number: QTCREATORBUG-1746
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
This commit is contained in:
Eike Ziller
2015-03-11 17:32:27 +01:00
parent faca938e35
commit 0d10ecd668
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -941,6 +941,9 @@ bool SessionManager::loadSession(const QString &session)
d->restoreValues(reader); d->restoreValues(reader);
emit m_instance->aboutToLoadSession(session); emit m_instance->aboutToLoadSession(session);
// retrieve all values before the following code could change them again
Id modeId = Id::fromSetting(value(QLatin1String("ActiveMode")));
QColor c = QColor(reader.restoreValue(QLatin1String("Color")).toString()); QColor c = QColor(reader.restoreValue(QLatin1String("Color")).toString());
if (c.isValid()) if (c.isValid())
StyleHelper::setBaseColor(c); StyleHelper::setBaseColor(c);
@@ -965,7 +968,6 @@ bool SessionManager::loadSession(const QString &session)
d->m_future = QFutureInterface<void>(); d->m_future = QFutureInterface<void>();
// restore the active mode // restore the active mode
Id modeId = Id::fromSetting(value(QLatin1String("ActiveMode")));
if (!modeId.isValid()) if (!modeId.isValid())
modeId = Id(Core::Constants::MODE_EDIT); modeId = Id(Core::Constants::MODE_EDIT);