From 9fca6209b7a12d1f8230dad7f4959a624c891c74 Mon Sep 17 00:00:00 2001
From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
Date: Tue, 9 Nov 2021 13:20:39 +0200
Subject: [PATCH] Make Scene responsible for handling
 Workspace::deletedRemoved()

---
 src/composite.cpp | 1 -
 src/scene.cpp     | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/composite.cpp b/src/composite.cpp
index 0a1c319219..d88c47b358 100644
--- a/src/composite.cpp
+++ b/src/composite.cpp
@@ -373,7 +373,6 @@ void Compositor::startupWithWorkspace()
 
     // Sets also the 'effects' pointer.
     kwinApp()->platform()->createEffectsHandler(this, m_scene);
-    connect(Workspace::self(), &Workspace::deletedRemoved, m_scene, &Scene::removeToplevel);
 
     for (X11Client *c : Workspace::self()->clientList()) {
         c->setupCompositing();
diff --git a/src/scene.cpp b/src/scene.cpp
index 63df70f7b2..e0712daacc 100644
--- a/src/scene.cpp
+++ b/src/scene.cpp
@@ -98,6 +98,8 @@ void Scene::initialize()
 {
     connect(kwinApp()->platform(), &Platform::outputDisabled, this, &Scene::removeRepaints);
 
+    connect(workspace(), &Workspace::deletedRemoved, this, &Scene::removeToplevel);
+
     connect(workspace(), &Workspace::geometryChanged, this, &Scene::addRepaintFull);
     connect(workspace(), &Workspace::currentActivityChanged, this, &Scene::addRepaintFull);
     connect(workspace(), &Workspace::currentDesktopChanged, this, &Scene::addRepaintFull);