Skip to content

Commit f36cb1b

Browse files
committed
Fixing progress listener detaching if the window was autoclosed. Fixes issue 8093
1 parent d197b82 commit f36cb1b

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

javascript/firefox-driver/js/webLoadingListener.js

+6-2
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,9 @@ WebLoadingListener = function(browser, toCall, timeout, opt_window) {
241241

242242
var handler = this.handler;
243243
loadingListenerTimer.setTimeout(function() {
244-
browser.removeProgressListener(handler);
244+
if (browser.removeProgressListener) {
245+
browser.removeProgressListener(handler);
246+
}
245247
func(true);
246248
}, timeout);
247249
};
@@ -252,5 +254,7 @@ WebLoadingListener = function(browser, toCall, timeout, opt_window) {
252254
* @param {!WebLoadingListener} listener The listener to remove.
253255
*/
254256
WebLoadingListener.removeListener = function(browser, listener) {
255-
browser.removeProgressListener(listener.handler);
257+
if (browser.removeProgressListener) {
258+
browser.removeProgressListener(listener.handler);
259+
}
256260
};

0 commit comments

Comments
 (0)