kdesktop: simplify lock process code. This ensure correct cleanup in case of unexpected termination of the process.issue/662/test

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 2d93220f219424527a24275d838382fedd0d73fc)

1 files changed, 7 insertions, 4 deletions

diff --git a/kdesktop/lockeng.cpp b/kdesktop/lockeng.cpp
index 5d40e3425..4e3899c8f 100644
--- a/kdesktop/lockeng.cpp
+++ b/kdesktop/lockeng.cpp
@@ -732,16 +732,16 @@ void SaverEngineEventHandler::lockCompleted()
 {
 	kdDebug(1204) << "SaverEngineEventHandler: lock completed" << endl;
 
-	if (trinity_lockeng_sak_available)
-	{
-		startSAKProcess();
-	}
 	if (m_state == Waiting)
 	{
 		return;
 	}
 
 	m_state = Waiting;
+	if (trinity_lockeng_sak_available)
+	{
+		startSAKProcess();
+	}
 	TQTimer::singleShot(0, m_saverEngine, TQ_SLOT(stopLockProcessGUI()));
 }
 
@@ -797,6 +797,9 @@ void SaverEngineEventHandler::saveScreen()
 
 void SaverEngineEventHandler::slotLockProcessExited()
 {
+	// Clean up status after the lock process has exited
+	lockCompleted();
+
 	m_lockProcessRestarting = true;
 
 	bool abnormalExit = false;