summaryrefslogtreecommitdiffstats
path: root/kdesktop
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2014-04-29 22:09:31 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2014-04-29 22:09:31 +0900
commit710fc43897e238108833df8c616c76239c6185b4 (patch)
tree83ff324dbffa6030d8e6a72512e0ecc0b23cf3b6 /kdesktop
parent59ef38d29164cfb93c8137c6245d402182aa9157 (diff)
downloadtdebase-710fc43897e238108833df8c616c76239c6185b4.tar.gz
tdebase-710fc43897e238108833df8c616c76239c6185b4.zip
Fixed commit 59ef38d: now the Desktop Session Locked works as expected.
This resolves (again) bug 1584.
Diffstat (limited to 'kdesktop')
-rw-r--r--kdesktop/lock/lockdlg.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/kdesktop/lock/lockdlg.cc b/kdesktop/lock/lockdlg.cc
index c3779581f..847e018d1 100644
--- a/kdesktop/lock/lockdlg.cc
+++ b/kdesktop/lock/lockdlg.cc
@@ -271,7 +271,8 @@ PasswordDlg::~PasswordDlg()
void PasswordDlg::reject()
{
- if (!trinity_desktop_lock_hide_cancel_button)
+ if (!trinity_desktop_lock_hide_cancel_button || trinity_desktop_lock_autohide_lockdlg ||
+ trinity_desktop_lock_use_sak)
{
TQDialog::reject();
}