From e2dc6380d1a57382cbc720394a5dbac5d18da48c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Fri, 4 Dec 2015 16:09:47 +0100 Subject: [PATCH] [wayland] Pass processStartupEnvironment to ScreenLocker Need to pass a proper env to ScreenLocker to ensure we don't mess with the greeter's environment by e.g. unsetting QT_IM_MODULE or setting EGL_PLATFORM. Reviewed-By: Bhushan Shah --- wayland_server.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/wayland_server.cpp b/wayland_server.cpp index 8bc472c3e0..9986c1832b 100644 --- a/wayland_server.cpp +++ b/wayland_server.cpp @@ -237,6 +237,7 @@ void WaylandServer::initWorkspace() ScreenLocker::KSldApp::self(); ScreenLocker::KSldApp::self()->setWaylandDisplay(m_display); + ScreenLocker::KSldApp::self()->setGreeterEnvironment(kwinApp()->processStartupEnvironment()); ScreenLocker::KSldApp::self()->initialize(); connect(ScreenLocker::KSldApp::self(), &ScreenLocker::KSldApp::greeterClientConnectionChanged, this,