ScreenShield: don't reset the lock screen animation if it's already happening
When you click Suspend from the user menu, the following things happen: - we lock the screen internally by calling Main.screenShield.lock() and waiting for lock-screen-shown - logind emits a Lock signal, which causes us to lock again - gnome-settings-daemon notices PrepareForSleep, and calls org.gnome.ScreenSaver.Lock, just in case, so we lock once more This means that, if you're lucky, you can see the curtain fall down multiple times, as each .lock() call resets the animation. https://bugzilla.gnome.org/show_bug.cgi?id=690858
This commit is contained in:
parent
507f29a7bd
commit
a757ce48a1
@ -760,6 +760,10 @@ const ScreenShield = new Lang.Class({
|
||||
},
|
||||
|
||||
_resetLockScreen: function(animateLockScreen, animateLockDialog) {
|
||||
if (this._lockScreenState == MessageTray.State.SHOWING ||
|
||||
this._lockScreenState == MessageTray.State.SHOWN)
|
||||
return;
|
||||
|
||||
this._ensureLockScreen();
|
||||
this._lockDialogGroup.scale_x = 1;
|
||||
this._lockDialogGroup.scale_y = 1;
|
||||
|
Loading…
Reference in New Issue
Block a user