From e614789583a63a734390cd986381341b1607edb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= <mgraesslin@kde.org>
Date: Tue, 26 Apr 2016 13:40:24 +0200
Subject: [PATCH] Destroy Workspace after unloading all effects

CI system shows that on tear down an effect might call into Workspace
after it's destroyed. Unloading all effects prior to deleting Workspace
should(TM) fix that. Unfortunately I'm not able to reproduce the problem
locally, so build.kde.org needs to verify.
---
 main_wayland.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/main_wayland.cpp b/main_wayland.cpp
index a9ece4de5d..0f6d5d60b0 100644
--- a/main_wayland.cpp
+++ b/main_wayland.cpp
@@ -86,12 +86,12 @@ ApplicationWayland::~ApplicationWayland()
     }
 
     kwinApp()->platform()->setOutputsEnabled(false);
-    destroyWorkspace();
-    waylandServer()->dispatch();
     // need to unload all effects prior to destroying X connection as they might do X calls
     if (effects) {
         static_cast<EffectsHandlerImpl*>(effects)->unloadAllEffects();
     }
+    destroyWorkspace();
+    waylandServer()->dispatch();
     disconnect(m_xwaylandFailConnection);
     if (x11Connection()) {
         Xcb::setInputFocus(XCB_INPUT_FOCUS_POINTER_ROOT);