From 87795eef2a71d85680f797fe75404ca1a9a63a10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20L=C3=BCbking?= <thomas.luebking@gmail.com>
Date: Fri, 15 Jan 2016 01:37:51 +0100
Subject: [PATCH] Actually keep the expandedGeometry alive

... until the effects handled the deletion

BUG: 318322
BUG: 320892
BUG: 344359
REVIEW: 126323

FIXED-IN: 5.6
---
 composite.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composite.cpp b/composite.cpp
index aa0e4b7286..b09decf0c1 100644
--- a/composite.cpp
+++ b/composite.cpp
@@ -311,7 +311,6 @@ void Compositor::startupWithWorkspace()
     }
     Q_ASSERT(m_scene);
     claimCompositorSelection();
-    connect(Workspace::self(), &Workspace::deletedRemoved, m_scene, &Scene::windowDeleted);
     m_xrrRefreshRate = KWin::currentRefreshRate();
     fpsInterval = options->maxFpsInterval();
     if (m_scene->syncsToVBlank()) {  // if we do vsync, set the fps to the next multiple of the vblank rate
@@ -323,6 +322,7 @@ void Compositor::startupWithWorkspace()
     scheduleRepaint();
     xcb_composite_redirect_subwindows(connection(), rootWindow(), XCB_COMPOSITE_REDIRECT_MANUAL);
     new EffectsHandlerImpl(this, m_scene);   // sets also the 'effects' pointer
+    connect(Workspace::self(), &Workspace::deletedRemoved, m_scene, &Scene::windowDeleted);
     connect(effects, SIGNAL(screenGeometryChanged(QSize)), SLOT(addRepaintFull()));
     addRepaintFull();
     foreach (Client * c, Workspace::self()->clientList()) {