From 7253235a288a403fc2a14178fe38f2d99d5ea855 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Thu, 22 Oct 2015 10:07:02 +0200 Subject: [PATCH] [wayland] Dispatch the WaylandServer once more before killing internal client This is needed to not deadlock during tear down in case the client wants to dispatch events and the server is in wait for client. --- wayland_server.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/wayland_server.cpp b/wayland_server.cpp index 69493f74de..3bbf59f294 100644 --- a/wayland_server.cpp +++ b/wayland_server.cpp @@ -70,6 +70,7 @@ WaylandServer::WaylandServer(QObject *parent) WaylandServer::~WaylandServer() { if (m_internalConnection.client) { + dispatch(); m_internalConnection.client->deleteLater(); m_internalConnection.clientThread->quit(); m_internalConnection.clientThread->wait();