summaryrefslogtreecommitdiffstats
path: root/ksmserver
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-05-07 02:39:26 -0500
committerSlávek Banko <slavek.banko@axis.cz>2013-05-09 19:56:12 +0200
commitedcb2b0e8185d4620bf07fac50d818cb3c272644 (patch)
treed627157329ae3eac3673a32b421fe234945c2ba5 /ksmserver
parent35fbe8f408dde2fa0efe2aba3f8ecc78565e6696 (diff)
downloadtdebase-edcb2b0e8185d4620bf07fac50d818cb3c272644.tar.gz
tdebase-edcb2b0e8185d4620bf07fac50d818cb3c272644.zip
Fix lock screen interaction with suspend/hibernate
Use built-in premultiplied ARGB method (cherry picked from commit 24e3f6f2fad88b7a3c28f127dff5f02cd41fed99)
Diffstat (limited to 'ksmserver')
-rw-r--r--ksmserver/shutdown.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/ksmserver/shutdown.cpp b/ksmserver/shutdown.cpp
index ea0773eb6..584fa57c1 100644
--- a/ksmserver/shutdown.cpp
+++ b/ksmserver/shutdown.cpp
@@ -194,7 +194,11 @@ void KSMServer::shutdownInternal( KApplication::ShutdownConfirm confirm,
KConfig 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()");
}
}
}