diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-01-10 14:57:16 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-10 16:11:19 +0100 |
| commit | c95aea407b89ee5ad4f5f87971104d05a453f9da (patch) | |
| tree | 11078797723e8f5b850c8f1a76567790e14b4a18 /src/widgets | |
| parent | 7776beacf720cf4478767f5b75440c4a359d8bcf (diff) | |
Fix a crash in QDialog.
Call d->helperDone before deleting 'this'.
Change-Id: I06224f4d3a868dccd505b1f1d3ed56af6f339ba3
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Diffstat (limited to 'src/widgets')
| -rw-r--r-- | src/widgets/dialogs/qdialog.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/widgets/dialogs/qdialog.cpp b/src/widgets/dialogs/qdialog.cpp index 501fd4d264..af11fc971d 100644 --- a/src/widgets/dialogs/qdialog.cpp +++ b/src/widgets/dialogs/qdialog.cpp @@ -520,10 +520,10 @@ int QDialog::exec() setAttribute(Qt::WA_ShowModal, wasShowModal); int res = result(); - if (deleteOnClose) - delete this; if (d->nativeDialogInUse) d->helperDone(static_cast<QDialog::DialogCode>(res), d->platformHelper()); + if (deleteOnClose) + delete this; return res; } |