diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2021-10-13 15:36:08 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2021-10-18 19:06:48 +0200 |
| commit | acb86da793c603991da63ba6ab7c6684518d0cd2 (patch) | |
| tree | 76977ba20507c92cd7f46875cc431ddd5355a2c4 /src/gui/kernel/qwindow.cpp | |
| parent | 826fc8c9bd0b7dabb58e0b278b52c5d9f7a7efd9 (diff) | |
Prevent recursive calls to QWindow::close
QWidget will call close() in its destructor, which we might end up
in if a user deletes the widget in the closeEvent.
Pick-to: 6.2
Change-Id: I39684aec0ca130033dad60f2bbf823364a5edcec
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/gui/kernel/qwindow.cpp')
| -rw-r--r-- | src/gui/kernel/qwindow.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp index 26ad97bc86..561682f65d 100644 --- a/src/gui/kernel/qwindow.cpp +++ b/src/gui/kernel/qwindow.cpp @@ -2257,6 +2257,8 @@ void QWindow::showNormal() bool QWindow::close() { Q_D(QWindow); + if (d->inClose) + return true; // Do not close non top level windows if (!isTopLevel()) |