loginDialog: Make sure timed login indicator is shown after idle timeout

If the idle timeout is done, always show the user list to make sure the
timed login indicator is visible.
This commit is contained in:
verdre 2018-04-17 22:51:40 +02:00
parent 5cc6fef689
commit 86a741c1ee

View File

@ -1052,6 +1052,11 @@ var LoginDialog = new Lang.Class({
this._blockTimedLoginUntilIdle,
() => {
// If idle timeout is done, make sure the timed login indicator is shown
if (this._timedLoginDelay > _TIMED_LOGIN_IDLE_THRESHOLD &&
this._authPrompt.actor.visible)
this._authPrompt.cancel();
if (this._timedLoginDelay > _TIMED_LOGIN_IDLE_THRESHOLD || firstRun) {
this._userList.scrollToItem(this._timedLoginItem);
this._timedLoginItem.actor.grab_key_focus();
@ -1071,6 +1076,9 @@ var LoginDialog = new Lang.Class({
},
_onTimedLoginRequested(client, userName, seconds) {
if (this._timedLoginBatch)
return;
this._startTimedLogin(userName, seconds);
// Restart timed login on user interaction