Ensure Workspace is only started once in Wayland-only mode

The connect to Compositor::sceneCreated must be disconnected again, otherwise a restart of the Compositor results in Workspace being created again. Thanks to our autotests for finding this problem!
KDE · Oct 1, 2017 · d75e5c6 · d75e5c6
1 parent f0445b2
commit d75e5c6
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 12 deletions.
diff --git a/autotests/integration/kwin_wayland_test.cpp b/autotests/integration/kwin_wayland_test.cpp
@@ -119,17 +119,19 @@ void WaylandTestApplication::continueStartupWithScreens()
 
     if (operationMode() == OperationModeWaylandOnly) {
         createCompositor();
-        connect(Compositor::self(), &Compositor::sceneCreated, this,
-            [this] {
-                createWorkspace();
-            }
-        );
+        connect(Compositor::self(), &Compositor::sceneCreated, this, &WaylandTestApplication::continueStartupWithSceen);
         return;
     }
     createCompositor();
     connect(Compositor::self(), &Compositor::sceneCreated, this, &WaylandTestApplication::startXwaylandServer);
 }
 
+void WaylandTestApplication::continueStartupWithSceen()
+{
+    disconnect(Compositor::self(), &Compositor::sceneCreated, this, &WaylandTestApplication::continueStartupWithSceen);
+    createWorkspace();
+}
+
 void WaylandTestApplication::continueStartupWithX()
 {
     createX11Connection();

diff --git a/autotests/integration/kwin_wayland_test.h b/autotests/integration/kwin_wayland_test.h
@@ -64,6 +64,7 @@ class WaylandTestApplication : public Application
     void createBackend();
     void createX11Connection();
     void continueStartupWithScreens();
+    void continueStartupWithSceen();
     void continueStartupWithX();
     void startXwaylandServer();
 

diff --git a/main_wayland.cpp b/main_wayland.cpp
@@ -162,19 +162,21 @@ void ApplicationWayland::continueStartupWithScreens()
 
     if (operationMode() == OperationModeWaylandOnly) {
         createCompositor();
-        connect(Compositor::self(), &Compositor::sceneCreated, this,
-            [this] {
-                startSession();
-                createWorkspace();
-                notifyKSplash();
-            }
-        );
+        connect(Compositor::self(), &Compositor::sceneCreated, this, &ApplicationWayland::continueStartupWithSceen);
         return;
     }
     createCompositor();
     connect(Compositor::self(), &Compositor::sceneCreated, this, &ApplicationWayland::startXwaylandServer);
 }
 
+void ApplicationWayland::continueStartupWithSceen()
+{
+    disconnect(Compositor::self(), &Compositor::sceneCreated, this, &ApplicationWayland::continueStartupWithSceen);
+    startSession();
+    createWorkspace();
+    notifyKSplash();
+}
+
 void ApplicationWayland::continueStartupWithX()
 {
     createX11Connection();

diff --git a/main_wayland.h b/main_wayland.h
@@ -61,6 +61,7 @@ class ApplicationWayland : public Application
     void createBackend();
     void createX11Connection();
     void continueStartupWithScreens();
+    void continueStartupWithSceen();
     void continueStartupWithX();
     void startXwaylandServer();
     void startSession();