From 7916eb86bd24cf9ed16e10185790df6cc44fb8d4 Mon Sep 17 00:00:00 2001 From: Paul Olav Tvete Date: Fri, 25 Nov 2016 12:47:23 +0100 Subject: Fix crash on client exit with popup Change-Id: Ideb7a07dbeae5829334a8d8ce685c6bbdfd495d2 Reviewed-by: Johan Helsing --- src/compositor/extensions/qwaylandwlshellintegration.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; } -- cgit v1.2.3