Issue 5809: Firebug triggers Firefox crash on Ubuntu since the fix fo…

…r issue 5427
firebug · Aug 14, 2012 · 4659a62 · simonlindholm · Aug 14, 2012 · janodvarko
1 parent 8970fa8
commit 4659a62
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/extension/content/firebug/firebugOverlay.xul b/extension/content/firebug/firebugOverlay.xul
@@ -62,8 +62,8 @@
                                 <image src="chrome://firebug/skin/firebug.png"/>
 
                                 <menupopup id="menu_firebug_iconMenu" class="fbFirebugMenuPopup"
-                                    onpopupshowing="return Firebug.GlobalUI.onMenuShowing(this);"
-                                    onpopuphiding="return Firebug.GlobalUI.onMenuHiding(this);">
+                                    onpopupshowing="return Firebug.GlobalUI.onMenuShowing(this, event);"
+                                    onpopuphiding="return Firebug.GlobalUI.onMenuHiding(this, event);">
                                     <!-- Content comes from firebugMenuContent -->
                                 </menupopup>
                             </toolbarbutton>

diff --git a/extension/content/firebug/firefox/browserOverlay.js b/extension/content/firebug/firefox/browserOverlay.js
@@ -374,10 +374,10 @@ Firebug.GlobalUI =
         PrefLoader.setPref(option, checked);
     },
 
-    onMenuShowing: function(popup)
+    onMenuShowing: function(popup, event)
     {
-        // If this popup is already open the event comes from a sub menu, just ignore it.
-        if (popup.state == "open")
+        // If the event comes from a sub menu, just ignore it.
+        if (popup != event.target)
             return;
 
         while (popup.lastChild)
@@ -451,7 +451,7 @@ Firebug.GlobalUI =
 
     onMenuHiding: function(popup)
     {
-        if (popup.state == "open")
+        if (popup != event.target)
             return;
 
         // xxxHonza: I don't know why the timeout must be here, but if it isn't
@@ -1072,8 +1072,8 @@ $menupopupOverlay($("menuWebDeveloperPopup"), [
         $menupopup({
             id: "menu_firebug_firebugMenuPopup",
             "class": "fbFirebugMenuPopup",
-            onpopupshowing: "return Firebug.GlobalUI.onMenuShowing(this);",
-            onpopuphiding: "return Firebug.GlobalUI.onMenuHiding(this);"
+            onpopupshowing: "return Firebug.GlobalUI.onMenuShowing(this, event);",
+            onpopuphiding: "return Firebug.GlobalUI.onMenuHiding(this, event);"
         })
     ]),
     $menuseparator({
@@ -1095,8 +1095,8 @@ $menupopupOverlay($("appmenu_webDeveloper_popup"), [
         $menupopup({
             id: "appmenu_firebugMenuPopup",
             "class": "fbFirebugMenuPopup",
-            onpopupshowing: "return Firebug.GlobalUI.onMenuShowing(this);",
-            onpopuphiding: "return Firebug.GlobalUI.onMenuHiding(this);"
+            onpopupshowing: "return Firebug.GlobalUI.onMenuShowing(this, event);",
+            onpopuphiding: "return Firebug.GlobalUI.onMenuHiding(this, event);"
         })
     ]),
     $menuseparator({
@@ -1117,8 +1117,8 @@ $menupopupOverlay($("toolsPopup"), [
         $menupopup({
             id: "toolsmenu_firebugMenuPopup",
             "class": "fbFirebugMenuPopup",
-            onpopupshowing: "return Firebug.GlobalUI.onMenuShowing(this);",
-            onpopupshowing: "return Firebug.GlobalUI.onMenuHiding(this);"
+            onpopupshowing: "return Firebug.GlobalUI.onMenuShowing(this, event);",
+            onpopupshowing: "return Firebug.GlobalUI.onMenuHiding(this, event);"
         })
     ])
 ]);