From 550cbe5a375b5a95ebcc0f2bb6cd5727711011e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20Qu=C3=A8ze?= <florian@queze.net>
Date: Mon, 29 Sep 2014 15:33:34 +0200
Subject: [PATCH] Bug 1067367 - tapping the icon of a second doorhanger reopens
 the first doorhanger if it was already open, r=Enn.

---
 toolkit/modules/PopupNotifications.jsm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/toolkit/modules/PopupNotifications.jsm b/toolkit/modules/PopupNotifications.jsm
index afe39732293c..a0fe4e9ddbd1 100644
--- a/toolkit/modules/PopupNotifications.jsm
+++ b/toolkit/modules/PopupNotifications.jsm
@@ -488,9 +488,15 @@ PopupNotifications.prototype = {
    * Hides the notification popup.
    */
   _hidePanel: function PopupNotifications_hide() {
+    // We need to disable the closing animation when setting _ignoreDismissal
+    // to true, otherwise the popuphidden event will fire after we have set
+    // _ignoreDismissal back to false.
+    let transitionsEnabled = this.transitionsEnabled;
+    this.transitionsEnabled = false;
     this._ignoreDismissal = true;
     this.panel.hidePopup();
     this._ignoreDismissal = false;
+    this.transitionsEnabled = transitionsEnabled;
   },
 
   /**