From 710fc43897e238108833df8c616c76239c6185b4 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Tue, 29 Apr 2014 22:09:31 +0900 Subject: Fixed commit 59ef38d: now the Desktop Session Locked works as expected. This resolves (again) bug 1584. --- kdesktop/lock/lockdlg.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'kdesktop') 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(); } -- cgit v1.2.1