summaryrefslogtreecommitdiffstats
path: root/ksmserver/shutdown.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-05-07 02:39:26 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-05-07 02:39:26 -0500
commit24e3f6f2fad88b7a3c28f127dff5f02cd41fed99 (patch)
tree4c042bb6fc44be3a1fc1e147aefbba55c30f7c72 /ksmserver/shutdown.cpp
parent9aa01ee718181904f2bfae853c36b127c3ee23a1 (diff)
downloadtdebase-24e3f6f2fad88b7a3c28f127dff5f02cd41fed99.tar.gz
tdebase-24e3f6f2fad88b7a3c28f127dff5f02cd41fed99.zip
Fix lock screen interaction with suspend/hibernate
Use built-in premultiplied ARGB method
Diffstat (limited to 'ksmserver/shutdown.cpp')
-rw-r--r--ksmserver/shutdown.cpp6
1 files changed, 5 insertions, 1 deletions
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) {