From 78fd9d9e4fbec9fb1e789b9df15e7fda91d78ab6 Mon Sep 17 00:00:00 2001 From: Georges Basile Stavracas Neto Date: Thu, 28 Nov 2019 19:30:02 -0300 Subject: [PATCH] screenShield: Always show session's unlock dialog Instead of destroying the dialog when the screen shield is visible, and creating it when lifting the shield, always show the session's unlock dialog. https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/872 --- js/ui/screenShield.js | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js index 6a2e37e1b..918df0543 100644 --- a/js/ui/screenShield.js +++ b/js/ui/screenShield.js @@ -564,11 +564,6 @@ var ScreenShield = class { } _lockScreenShown(params) { - if (this._dialog && !this._isGreeter) { - this._dialog.destroy(); - this._dialog = null; - } - let motionId = global.stage.connect('captured-event', (stage, event) => { if (event.type() == Clutter.EventType.MOTION) { this._cursorTracker.set_pointer_visible(true); @@ -696,6 +691,8 @@ var ScreenShield = class { if (this._activationTime == 0) this._activationTime = GLib.get_monotonic_time(); + this._ensureUnlockDialog(true); + this.actor.show(); if (Main.sessionMode.currentMode != 'unlock-dialog' &&