osdWindow: Make sure to clear the hide timeout

When the osd window is hidden based on the timeout, it accidentally
left the timeout ID in place. When a subsequent switcher popup came
up, it thought the OSD window was scheduled to be hidden and tried
to re-hide the actor. This caused the tween to be run along with
an extra call to enable_unredirect_for_screen.
This commit is contained in:
Jasper St. Pierre 2013-06-24 17:15:33 -04:00
parent 16fa186b63
commit bc069b99ec

View File

@ -158,11 +158,11 @@ const OsdWindow = new Lang.Class({
return; return;
Mainloop.source_remove(this._hideTimeoutId); Mainloop.source_remove(this._hideTimeoutId);
this._hideTimeoutId = 0;
this._hide(); this._hide();
}, },
_hide: function() { _hide: function() {
this._hideTimeoutId = 0;
Tweener.addTween(this.actor, Tweener.addTween(this.actor,
{ opacity: 0, { opacity: 0,
time: FADE_TIME, time: FADE_TIME,