[gnome-shell] osdWindow: Make sure to clear the hide timeout

[Jasper St. Pierre <jstpierre src gnome org>]

commit bc069b99ecb7c4f918fe5b710d25c5a8450aa4a2
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Mon Jun 24 17:15:33 2013 -0400

    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.

 js/ui/osdWindow.js |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/js/ui/osdWindow.js b/js/ui/osdWindow.js
index f59c84c..bb7d888 100644
--- a/js/ui/osdWindow.js
+++ b/js/ui/osdWindow.js
@@ -158,11 +158,11 @@ const OsdWindow = new Lang.Class({
             return;
 
         Mainloop.source_remove(this._hideTimeoutId);
-        this._hideTimeoutId = 0;
         this._hide();
     },
 
     _hide: function() {
+        this._hideTimeoutId = 0;
         Tweener.addTween(this.actor,
                          { opacity: 0,
                            time: FADE_TIME,