From ea943606983e262054f51a39438e3b78aa507e2f Mon Sep 17 00:00:00 2001
From: Chris Pearce <chris@pearce.org.nz>
Date: Fri, 3 Sep 2010 12:03:03 +1200
Subject: [PATCH] Bug 485288 - Don't process video controls events after
 bindings detached. r=dolske a=blocking2.0

---
 toolkit/content/widgets/videocontrols.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/toolkit/content/widgets/videocontrols.xml b/toolkit/content/widgets/videocontrols.xml
index d0f5fed53ba..bff881f57d0 100644
--- a/toolkit/content/widgets/videocontrols.xml
+++ b/toolkit/content/widgets/videocontrols.xml
@@ -404,8 +404,10 @@
 
                     // If the binding is detached (or has been replaced by a
                     // newer instance of the binding), nuke our event-listeners.
-                    if (this.videocontrols.randomID != this.randomID)
+                    if (this.videocontrols.randomID != this.randomID) {
                         this.terminateEventListeners();
+                        return;
+                    }
 
                     switch (aEvent.type) {
                         case "play":