[gnome-shell/eos3.8: 232/255] screenShield: Reorder some statements



commit 027228fc71565fd3f01d6d3f69db4c80948b8a18
Author: Matthew Leeds <matthew leeds endlessm com>
Date:   Fri Apr 24 18:54:15 2020 -0700

    screenShield: Reorder some statements
    
    The order here doesn't matter as currently written, but it will matter
    after the next commit which adds an early return. And this is more
    consistent with upstream.
    
    https://phabricator.endlessm.com/T29527
    (cherry picked from commit d36e9e9e5e3fc2763f7a7c987970f2c6a882889e)

 js/ui/screenShield.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js
index 95f9e1e548..f15d05ebf3 100644
--- a/js/ui/screenShield.js
+++ b/js/ui/screenShield.js
@@ -621,6 +621,8 @@ var ScreenShield = class {
         if (this._activationTime == 0)
             this._activationTime = GLib.get_monotonic_time();
 
+        this._ensureUnlockDialog(true);
+
         this._isGreeter = Main.sessionMode.isGreeter;
         if (!this._isGreeter) {
             let userManager = AccountsService.UserManager.get_default();
@@ -636,8 +638,6 @@ var ScreenShield = class {
                 Main.sessionMode.pushMode('unlock-dialog-payg');
         }
 
-        this._ensureUnlockDialog(true);
-
         this.actor.show();
 
         this._resetLockScreen({ animateLockScreen: animate,


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]