Commit 2b217ce7 authored by Aleix Pol Gonzalez's avatar Aleix Pol Gonzalez 🐧 Committed by Aleix Pol Gonzalez
Browse files

Initialize the KSldApp after we connect

In some cases, initialize() will emit an aboutToLock() signal that we
need to catch. Otherwise LockOnStart finds its m_waylandFd=-1


(cherry picked from commit c9715a82)
parent 79fadcc6
Pipeline #136180 passed with stage
in 12 minutes and 44 seconds
......@@ -594,7 +594,6 @@ void WaylandServer::initScreenLocker()
auto *screenLockerApp = ScreenLocker::KSldApp::self();
ScreenLocker::KSldApp::self()->setGreeterEnvironment(kwinApp()->processStartupEnvironment());
ScreenLocker::KSldApp::self()->initialize();
connect(ScreenLocker::KSldApp::self(), &ScreenLocker::KSldApp::aboutToLock, this,
[this, screenLockerApp] () {
......@@ -633,6 +632,8 @@ void WaylandServer::initScreenLocker()
}
);
ScreenLocker::KSldApp::self()->initialize();
if (m_initFlags.testFlag(InitializationFlag::LockScreen)) {
ScreenLocker::KSldApp::self()->lock(ScreenLocker::EstablishLock::Immediate);
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment