summaryrefslogtreecommitdiff
path: root/src/plugins/projectexplorer/sessiondialog.cpp
diff options
context:
space:
mode:
authorDaniel Molkentin <daniel.molkentin@nokia.com>2009-06-05 17:28:33 +0200
committerDaniel Molkentin <daniel.molkentin@nokia.com>2009-06-05 17:28:33 +0200
commit6c7f03e29ebc6420edc93357e6feb8fd71a0d0a7 (patch)
tree337efea1f845655f4fae337f82ddb96639d1bd33 /src/plugins/projectexplorer/sessiondialog.cpp
parent98981a670026ea761a463373a6a00534d3351487 (diff)
downloadqt-creator-6c7f03e29ebc6420edc93357e6feb8fd71a0d0a7.tar.gz
Session manager will no longer try to load a session when clicking OK.
This double role of managing sessions *and* loading the active one was always a bit odd and confusing (unexpected behavior). Reviewed-By: dt
Diffstat (limited to 'src/plugins/projectexplorer/sessiondialog.cpp')
-rw-r--r--src/plugins/projectexplorer/sessiondialog.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/plugins/projectexplorer/sessiondialog.cpp b/src/plugins/projectexplorer/sessiondialog.cpp
index 1285bf171d..ec5fadbe13 100644
--- a/src/plugins/projectexplorer/sessiondialog.cpp
+++ b/src/plugins/projectexplorer/sessiondialog.cpp
@@ -139,15 +139,13 @@ void SessionDialog::updateActions()
if (m_ui.sessionList->currentItem())
enableDelete = (m_ui.sessionList->currentItem()->text() != m_sessionManager->activeSession()
- && m_ui.sessionList->currentItem()->text() != "default");
+ && (m_ui.sessionList->currentItem()->text() != QLatin1String("default")));
m_ui.btDelete->setEnabled(enableDelete);
}
void SessionDialog::accept()
{
- if (m_ui.sessionList->currentItem()) {
- m_sessionManager->loadSession(m_ui.sessionList->currentItem()->text());
- }
+ // do nothing
QDialog::accept();
}