summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kdesktop/lock/lockdlg.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/kdesktop/lock/lockdlg.cc b/kdesktop/lock/lockdlg.cc
index b22eddbd8..652be2a7f 100644
--- a/kdesktop/lock/lockdlg.cc
+++ b/kdesktop/lock/lockdlg.cc
@@ -248,7 +248,7 @@ void PasswordDlg::timerEvent(TQTimerEvent *ev)
mUnlockingFailed = false;
updateLabel();
ok->setEnabled(true);
- cancel->setEnabled(true);
+ if (trinity_desktop_lock_autohide_lockdlg) cancel->setEnabled(true);
mNewSessButton->setEnabled( true );
greet->revive();
greet->start();