From f36cb1bd4cf72e675fe50238ad72842b9046c827 Mon Sep 17 00:00:00 2001
From: Alexei Barantsev <barancev@gmail.com>
Date: Mon, 27 Oct 2014 12:27:51 +0300
Subject: [PATCH] Fixing progress listener detaching if the window was
 autoclosed. Fixes issue 8093

---
 javascript/firefox-driver/js/webLoadingListener.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/javascript/firefox-driver/js/webLoadingListener.js b/javascript/firefox-driver/js/webLoadingListener.js
index f03b4d4c44bba..750e30a72d019 100644
--- a/javascript/firefox-driver/js/webLoadingListener.js
+++ b/javascript/firefox-driver/js/webLoadingListener.js
@@ -241,7 +241,9 @@ WebLoadingListener = function(browser, toCall, timeout, opt_window) {
 
   var handler = this.handler;
   loadingListenerTimer.setTimeout(function() {
-    browser.removeProgressListener(handler);
+    if (browser.removeProgressListener) {
+      browser.removeProgressListener(handler);
+    }
     func(true);
   }, timeout);
 };
@@ -252,5 +254,7 @@ WebLoadingListener = function(browser, toCall, timeout, opt_window) {
  * @param {!WebLoadingListener} listener The listener to remove.
  */
 WebLoadingListener.removeListener = function(browser, listener) {
-  browser.removeProgressListener(listener.handler);
+  if (browser.removeProgressListener) {
+    browser.removeProgressListener(listener.handler);
+  }
 };