diff options
| author | Paul Olav Tvete <paul.tvete@qt.io> | 2016-11-25 12:47:23 +0100 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@qt.io> | 2016-11-25 13:43:02 +0000 |
| commit | 7916eb86bd24cf9ed16e10185790df6cc44fb8d4 (patch) | |
| tree | c3966a2c002653cc1333e73445e0664292d05217 /src/compositor/extensions | |
| parent | 98fe4728090673a8685127b286de0302e2c3d0ab (diff) | |
Fix crash on client exit with popup
Change-Id: Ideb7a07dbeae5829334a8d8ce685c6bbdfd495d2
Reviewed-by: Johan Helsing <johan.helsing@qt.io>
Diffstat (limited to 'src/compositor/extensions')
| -rw-r--r-- | src/compositor/extensions/qwaylandwlshellintegration.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compositor/extensions/qwaylandwlshellintegration.cpp b/src/compositor/extensions/qwaylandwlshellintegration.cpp index 761a9022e..abf5b627c 100644 --- a/src/compositor/extensions/qwaylandwlshellintegration.cpp +++ b/src/compositor/extensions/qwaylandwlshellintegration.cpp @@ -201,7 +201,7 @@ void WlShellIntegration::handlePopupClosed() void WlShellIntegration::handlePopupRemoved() { - if (m_shellSurface->shell()->mappedPopups().isEmpty()) + if (!m_shellSurface || m_shellSurface->shell()->mappedPopups().isEmpty()) QWaylandQuickShellEventFilter::cancelFilter(); isPopup = false; } |