From 8252927210f087b78b5608ee0a2ecd7f05821a5e Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Mon, 4 Aug 2025 19:25:13 +0900 Subject: kdesktop: simplify lock process code. This ensure correct cleanup in case of unexpected termination of the process. Signed-off-by: Michele Calgaro --- kdesktop/lockeng.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'kdesktop/lockeng.cpp') diff --git a/kdesktop/lockeng.cpp b/kdesktop/lockeng.cpp index 57a42c9b5..fc3c9db6e 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; -- cgit v1.2.3