From 24e3f6f2fad88b7a3c28f127dff5f02cd41fed99 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 7 May 2013 02:39:26 -0500 Subject: Fix lock screen interaction with suspend/hibernate Use built-in premultiplied ARGB method --- ksmserver/shutdown.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'ksmserver') diff --git a/ksmserver/shutdown.cpp b/ksmserver/shutdown.cpp index 9e8ee1d7c..01f092257 100644 --- a/ksmserver/shutdown.cpp +++ b/ksmserver/shutdown.cpp @@ -225,7 +225,11 @@ void KSMServer::shutdownInternal( TDEApplication::ShutdownConfirm confirm, TDEConfig config("power-managerrc"); bool lockOnResume = config.readBoolEntry("lockOnResume", true); if (lockOnResume) { - DCOPRef("kdesktop", "KScreensaverIface").send("lock"); + TQCString replyType; + TQByteArray replyData; + // Block here until lock is complete + // If this is not done the desktop of the locked session will be shown after suspend/hibernate until the lock fully engages! + DCOPRef("kdesktop", "KScreensaverIface").call("lock()"); } TDERootSystemDevice* rootDevice = hwDevices->rootSystemDevice(); if (rootDevice) { -- cgit v1.2.3