From dc8c33e856be8bcdec4e9423c60a85931ec100d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Mon, 23 May 2016 08:54:28 +0200 Subject: [PATCH] Destroy ShellClient when the SurfaceInterface gets destroyed KWayland was changed: the ShellSurfaceInterface does no longer get destroyed when the parent SurfaceInterface gets destroyed. For the wl_shell_surface there is no dtor request in the interface so the resource sticks around and also the ShellClient is kept. This change ensures that the ShellClient also gets destroyed when the Surface is destroyed. This should fix some broken tests. Cherry-picked from master to fix failing tests on build.kde.org. --- shell_client.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/shell_client.cpp b/shell_client.cpp index fed1d88c23..95be7711d8 100644 --- a/shell_client.cpp +++ b/shell_client.cpp @@ -89,6 +89,7 @@ ShellClient::ShellClient(ShellSurfaceInterface *surface) ); connect(surface, &ShellSurfaceInterface::destroyed, this, &ShellClient::destroyClient); connect(surface->surface(), &SurfaceInterface::unmapped, this, &ShellClient::unmap); + connect(surface->surface(), &SurfaceInterface::destroyed, this, &ShellClient::destroyClient); connect(surface, &ShellSurfaceInterface::titleChanged, this, &ShellClient::captionChanged); connect(surface, &ShellSurfaceInterface::fullscreenChanged, this, &ShellClient::clientFullScreenChanged);