From 88583b8eedf554678a94e36843beb248e7242efb Mon Sep 17 00:00:00 2001 From: Vlad Zahorodnii Date: Mon, 9 Oct 2023 11:13:24 +0300 Subject: [PATCH] Revert "waylandserver: fix race condition" This reverts commit 03d0a226fb616409fb9fc4a42f91fe059062edb3. ClientConnection object is no longer destroyed with delay after merging 5246d3924f47586bb955ef30d296a04c836fca06. --- src/wayland_server.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/wayland_server.cpp b/src/wayland_server.cpp index 6100b660f6..fffae9a093 100644 --- a/src/wayland_server.cpp +++ b/src/wayland_server.cpp @@ -693,9 +693,7 @@ int WaylandServer::createXWaylandConnection() m_xwaylandConnection->setScaleOverride(kwinApp()->xwaylandScale()); connect(kwinApp(), &Application::xwaylandScaleChanged, m_xwaylandConnection, [this]() { - if (m_xwaylandConnection) { - m_xwaylandConnection->setScaleOverride(kwinApp()->xwaylandScale()); - } + m_xwaylandConnection->setScaleOverride(kwinApp()->xwaylandScale()); }); return socket.fd;