From e64c12dd2788cc8e897763ae8240912ee9e83e64 Mon Sep 17 00:00:00 2001 From: Georges Basile Stavracas Neto Date: Thu, 28 Nov 2019 19:47:58 -0300 Subject: [PATCH] unlockDialog: Don't destroy on cancel Otherwise there will be no way to recover it in the future. Also remove an else condition that assumed the dialog would destroy itself on cancel. https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/872 --- js/ui/screenShield.js | 2 -- js/ui/unlockDialog.js | 2 -- 2 files changed, 4 deletions(-) diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js index 50a20cd6b..086c8b4f2 100644 --- a/js/ui/screenShield.js +++ b/js/ui/screenShield.js @@ -192,8 +192,6 @@ var ScreenShield = class { // on its own, so ensure it stays on lock screen // instead this._lockScreenGroup.grab_key_focus(); - } else { - this._dialog = null; } } diff --git a/js/ui/unlockDialog.js b/js/ui/unlockDialog.js index 1f0bc3bb1..1abe48c22 100644 --- a/js/ui/unlockDialog.js +++ b/js/ui/unlockDialog.js @@ -494,8 +494,6 @@ var UnlockDialog = GObject.registerClass({ cancel() { this._authPrompt.cancel(); - - this.destroy(); } addCharacter(unichar) {