diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-03-11 17:32:27 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-03-12 10:00:11 +0000 |
| commit | 0d10ecd66817632c85470dff7bd701e8f3bf31d2 (patch) | |
| tree | a8640fcc93631c30def3d5b20ac2d924ac8ef046 /src/plugins/projectexplorer | |
| parent | faca938e35dee3833e9f8b2735fbbbc8371237a2 (diff) | |
| download | qt-creator-0d10ecd66817632c85470dff7bd701e8f3bf31d2.tar.gz | |
Session: Fix that active mode was not restored
Change-Id: I3a94f1c18eb187716bfa275cfe8869c4fe046500
Task-number: QTCREATORBUG-1746
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
Diffstat (limited to 'src/plugins/projectexplorer')
| -rw-r--r-- | src/plugins/projectexplorer/session.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/projectexplorer/session.cpp b/src/plugins/projectexplorer/session.cpp index 716e03bddd..55425a9de2 100644 --- a/src/plugins/projectexplorer/session.cpp +++ b/src/plugins/projectexplorer/session.cpp @@ -941,6 +941,9 @@ bool SessionManager::loadSession(const QString &session) d->restoreValues(reader); 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()); if (c.isValid()) StyleHelper::setBaseColor(c); @@ -965,7 +968,6 @@ bool SessionManager::loadSession(const QString &session) d->m_future = QFutureInterface<void>(); // restore the active mode - Id modeId = Id::fromSetting(value(QLatin1String("ActiveMode"))); if (!modeId.isValid()) modeId = Id(Core::Constants::MODE_EDIT); |