From 6c7f03e29ebc6420edc93357e6feb8fd71a0d0a7 Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Fri, 5 Jun 2009 17:28:33 +0200 Subject: 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 --- src/plugins/projectexplorer/sessiondialog.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/plugins/projectexplorer/sessiondialog.cpp') 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(); } -- cgit v1.2.1