Merge branch 'jsd2' of github.com:firebug/firebug into jsd2

firebug · Dec 20, 2013 · df288bc · df288bc
2 parents d3b5b02 + 8092d4f
commit df288bc
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/extension/content/firebug/firefox/bindings.xml b/extension/content/firebug/firefox/bindings.xml
@@ -764,8 +764,10 @@
                             Firebug.currentContext);
                         if (itemObject == object)
                             return item;
-                        // For items implementing equals() (such as StackFrame)
-                        if (itemObject && itemObject.equals && itemObject.equals(object))
+                        // For items implementing equals() (such as StackFrame).
+                        // Also make sure we get an object from chrome.
+                        if (XPCNativeWrapper(itemObject) === itemObject && itemObject &&
+                            itemObject.equals && itemObject.equals(object))
                             return item;
                     }
                 }