Fix a potential kdesktop_lock malfunction whereby the user would not be presented with the login screen

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1258267 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 13 years ago
parent b69a488374
commit 8254be0914

@ -1515,6 +1515,11 @@ bool LockProcess::checkPass()
if (mAutoLogout)
killTimer(mAutoLogoutTimerId);
// Make sure we never launch the SAK or login dialog if windows are being closed down
// Otherwise we can get stuck in an irrecoverable state where any attempt to show the login screen is instantly aborted
if (trinity_desktop_lock_closing_windows)
return 0;
if (trinity_desktop_lock_use_sak) {
// Wait for SAK press before continuing...
SAKDlg inDlg( this );

Loading…
Cancel
Save