Fix a crash in QDialog.
Call d->helperDone before deleting 'this'. Change-Id: I06224f4d3a868dccd505b1f1d3ed56af6f339ba3 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
This commit is contained in:
parent
7776beacf7
commit
c95aea407b
@ -520,10 +520,10 @@ int QDialog::exec()
|
|||||||
setAttribute(Qt::WA_ShowModal, wasShowModal);
|
setAttribute(Qt::WA_ShowModal, wasShowModal);
|
||||||
|
|
||||||
int res = result();
|
int res = result();
|
||||||
if (deleteOnClose)
|
|
||||||
delete this;
|
|
||||||
if (d->nativeDialogInUse)
|
if (d->nativeDialogInUse)
|
||||||
d->helperDone(static_cast<QDialog::DialogCode>(res), d->platformHelper());
|
d->helperDone(static_cast<QDialog::DialogCode>(res), d->platformHelper());
|
||||||
|
if (deleteOnClose)
|
||||||
|
delete this;
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user