Commit d06e15a7 authored by Oliver Henshaw's avatar Oliver Henshaw
Browse files

Stop grace period on unlock

It was safe to leak the grace timer when it was in the lock process,
since it was killed on unlock. Now it is not.

A password should always be required if the screenlocker is explicitly
triggered; but a screenlocker invoked while the grace timer from a
previous invocation is still active can be dismissed without a password,
at least for a short while. This also meant that the screenlocker
keyboard shortcut would not work until the grace timer expired.

REVIEW: 108425
BUG: 313997
FIXED-IN: 4.10.1
parent 1739d32d
......@@ -243,6 +243,7 @@ void KSldApp::doUnlock()
m_lockWindow = NULL;
m_locked = false;
m_lockedTimer.invalidate();
endGraceTime();
KDisplayManager().setLock(false);
emit unlocked();
KNotification::event( QLatin1String("unlocked"));
......@@ -331,6 +332,7 @@ bool KSldApp::isGraceTime() const
void KSldApp::endGraceTime()
{
m_graceTimer->stop();
m_inGraceTime = false;
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment