diff options
author | Simon Hausmann <simon.hausmann@qt.io> | 2019-10-31 14:34:01 +0100 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-10-31 14:42:48 +0100 |
commit | 1a52c4db428e65f4a0b92bea5811014aaa387263 (patch) | |
tree | 5a8c0d02c08cd32db10b3923496fa0010336a123 /src/compositor/extensions/qwaylandwlshell.cpp | |
parent | 5832b6628d848b271efae99585206fa02fc214c9 (diff) | |
parent | 8d1fedd6781babaf130486e5c7192b0ebc9fb039 (diff) |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp
Change-Id: I42733f5ad9429a5d2ff6c804eb1f3f2d50f50811
Diffstat (limited to 'src/compositor/extensions/qwaylandwlshell.cpp')
-rw-r--r-- | src/compositor/extensions/qwaylandwlshell.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/compositor/extensions/qwaylandwlshell.cpp b/src/compositor/extensions/qwaylandwlshell.cpp index aa8a93aff..6eb1c06e4 100644 --- a/src/compositor/extensions/qwaylandwlshell.cpp +++ b/src/compositor/extensions/qwaylandwlshell.cpp @@ -457,7 +457,8 @@ QWaylandWlShellSurface::QWaylandWlShellSurface(QWaylandWlShell *shell, QWaylandS QWaylandWlShellSurface::~QWaylandWlShellSurface() { Q_D(QWaylandWlShellSurface); - QWaylandWlShellPrivate::get(d->m_shell)->unregisterShellSurface(this); + if (d->m_shell) + QWaylandWlShellPrivate::get(d->m_shell)->unregisterShellSurface(this); } /*! |