From 0621ed70db1176471ce992b8eeb4d32d90f2f547 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 8 Apr 2015 15:27:25 -0500 Subject: Eliminate usleep() loop during kdesktop startup Do not switch desktops if lock fails to engage (cherry picked from commit 751c96f9b1fc01675a1a9d34831104f98adfd84f) --- kdesktop/lockeng.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'kdesktop/lockeng.h') diff --git a/kdesktop/lockeng.h b/kdesktop/lockeng.h index e7be7a06e..782f779a3 100644 --- a/kdesktop/lockeng.h +++ b/kdesktop/lockeng.h @@ -89,7 +89,7 @@ public: * Called by KDesktop to wait for saver engage * @internal */ - void waitForLockEngage(); + bool waitForLockEngage(); public slots: void slotLockProcessWaiting(); @@ -125,6 +125,7 @@ protected: enum SaverState { Waiting, Preparing, Engaging, Saving }; enum LockType { DontLock, DefaultLock, ForceLock, SecureDialog }; bool startLockProcess( LockType lock_type ); + bool waitForLockProcessStart(); void stopLockProcess(); bool handleKeyPress(XKeyEvent *xke); void processLockTransactions(); -- cgit v1.2.1