Fixing progress listener detaching if the window was autoclosed. Fixe…

…s issue 8093
SeleniumHQ · Oct 27, 2014 · f36cb1b · f36cb1b
1 parent d197b82
commit f36cb1b
Showing 1 changed file with 6 additions and 2 deletions.
diff --git 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);
+  }
 };