From 7652f4272c965cddbb42acb673907a829bacfe90 Mon Sep 17 00:00:00 2001 From: Giovanni Campagna Date: Mon, 3 Jun 2013 23:45:31 +0200 Subject: [PATCH] ScreenShield: remove curtain animation when hiding without animation If we don't remove the animation, we might leave a pending call to _lockScreenShown() which would confuse our state tracking into thinking we're active when we're not. https://bugzilla.gnome.org/show_bug.cgi?id=700901 --- js/ui/screenShield.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js index 990f18ffb..ffe876246 100644 --- a/js/ui/screenShield.js +++ b/js/ui/screenShield.js @@ -882,6 +882,8 @@ const ScreenShield = new Lang.Class({ this._lockScreenState = MessageTray.State.HIDING; + Tweener.removeTweens(this._lockScreenGroup); + if (animate) { // Tween the lock screen out of screen // if velocity is not specified (i.e. we come here from pressing ESC), @@ -894,7 +896,6 @@ const ScreenShield = new Lang.Class({ velocity = Math.max(min_velocity, velocity); let time = (delta / velocity) / 1000; - Tweener.removeTweens(this._lockScreenGroup); Tweener.addTween(this._lockScreenGroup, { y: -h, time: time,