diff options
| author | Daniel Teske <daniel.teske@nokia.com> | 2011-08-23 16:00:46 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@nokia.com> | 2011-08-24 11:18:20 +0200 |
| commit | ebede115e8791bf795866d430394149220a2442f (patch) | |
| tree | cc8c19a2dfcd8665d31583b912617d315892c50e /src | |
| parent | 9b544a2740e58e6b5c87fc9e406ec85fe1ca326b (diff) | |
Partially revert -lastsession fix
Change-Id: I965c8e51ca38b343e65764f77fe1d204ff793f23
Reviewed-on: http://codereview.qt.nokia.com/3411
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/projectexplorer/projectexplorer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp index ebb1bde03f..a910e789a9 100644 --- a/src/plugins/projectexplorer/projectexplorer.cpp +++ b/src/plugins/projectexplorer/projectexplorer.cpp @@ -1318,10 +1318,10 @@ void ProjectExplorerPlugin::currentModeChanged(Core::IMode *mode, Core::IMode *o void ProjectExplorerPlugin::determineSessionToRestoreAtStartup() { - QStringList arguments = pluginSpec()->arguments(); // Process command line arguments first: - if (arguments.contains("-lastsession")) + if (pluginSpec()->arguments.contains("-lastsession")) d->m_sessionToRestoreAtStartup = d->m_session->lastSession(); + QStringList arguments = ExtensionSystem::PluginManager::instance()->arguments(); if (d->m_sessionToRestoreAtStartup.isNull()) { QStringList sessions = d->m_session->sessions(); // We have command line arguments, try to find a session in them |