From 0765a9819d88dd044b67732b67850ddc5d73bb97 Mon Sep 17 00:00:00 2001
From: con <qtc-committer@nokia.com>
Date: Thu, 21 Oct 2010 14:10:31 +0200
Subject: [PATCH] Fix potential crash when closing settings dialog.
We accessed the m_applied member after the dialog already was deleted.
Task-number: QTCREATORBUG-2844
Reviewed-by: Friedemann Kleint
---
src/plugins/coreplugin/dialogs/settingsdialog.cpp | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/plugins/coreplugin/dialogs/settingsdialog.cpp b/src/plugins/coreplugin/dialogs/settingsdialog.cpp
index 3f2790a3548..a87f81270f4 100644
--- a/src/plugins/coreplugin/dialogs/settingsdialog.cpp
+++ b/src/plugins/coreplugin/dialogs/settingsdialog.cpp
@@ -314,7 +314,6 @@ SettingsDialog::SettingsDialog(QWidget *parent) :
m_proxyModel, SLOT(setFilterFixedString(QString)));
connect(m_filterLineEdit, SIGNAL(filterChanged(QString)), this, SLOT(filter(QString)));
m_categoryList->setFocus();
- setAttribute(Qt::WA_DeleteOnClose);
}
void SettingsDialog::showPage(const QString &categoryId, const QString &pageId)
@@ -522,6 +521,11 @@ bool SettingsDialog::execDialog()
if (!m_running) {
m_running = true;
exec();
+ m_running = false;
+ m_instance = 0;
+ // make sure that the current "single" instance is deleted
+ // we can't delete right away, since we still access the m_applied member
+ deleteLater();
} else {
// exec dialog is called while the instance is already running
// this can happen when a event triggers a code path that wants to
--
GitLab