From 65e8c0c737605136ad55dc4a8e41c4217206efa2 Mon Sep 17 00:00:00 2001
From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
Date: Sun, 10 Oct 2021 18:22:40 +0300
Subject: [PATCH] Simplify WaylandServer::initWorkspace()

If kscreenlocker integration is on, the initialized() signal can be
still emitted in WaylandServer::initWorkspace().
---
 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 1ab0e5d486..4cd62f3694 100644
--- a/src/wayland_server.cpp
+++ b/src/wayland_server.cpp
@@ -580,9 +580,8 @@ void WaylandServer::initWorkspace()
 
     if (hasScreenLockerIntegration()) {
         initScreenLocker();
-    } else {
-        Q_EMIT initialized();
     }
+    Q_EMIT initialized();
 }
 
 void WaylandServer::initScreenLocker()
@@ -632,7 +631,6 @@ void WaylandServer::initScreenLocker()
     if (m_initFlags.testFlag(InitializationFlag::LockScreen)) {
         ScreenLocker::KSldApp::self()->lock(ScreenLocker::EstablishLock::Immediate);
     }
-    Q_EMIT initialized();
 }
 
 WaylandServer::SocketPairConnection WaylandServer::createConnection()