diff options
author | Simon Hausmann <simon.hausmann@qt.io> | 2019-10-31 12:37:35 +0100 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-10-31 12:37:35 +0100 |
commit | 8d1fedd6781babaf130486e5c7192b0ebc9fb039 (patch) | |
tree | 20ea97a9cc518de8254820bf64a2e3941628dd17 /src/compositor/extensions/qwaylandwlshell.cpp | |
parent | 3c5a3654c1f68cd7ee7e801ab098510ebc6a9071 (diff) | |
parent | d4ac2c9915fed87193cd2cf7ac438a9fa8edc126 (diff) |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I29524a74e495dd46c0dc5d0a0d10e41e55526f14
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); } /*! |