Firefox: Fixing closed window handling in FF45

SeleniumHQ · Feb 10, 2016 · 9c2f12d · 9c2f12d
1 parent 0f45bdd
commit 9c2f12d
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/javascript/firefox-driver/js/nsCommandProcessor.js b/javascript/firefox-driver/js/nsCommandProcessor.js
@@ -462,10 +462,16 @@ nsCommandProcessor.prototype.execute = function(jsonCommandString,
     return;
   }
 
-  var contentWindow = sessionWindow.getBrowser().contentWindow;
-  if (!contentWindow) {
-    response.sendError(new WebDriverError(bot.ErrorCode.NO_SUCH_WINDOW,
+  try {
+    var contentWindow = sessionWindow.getBrowser().contentWindow;
+    if (!contentWindow) {
+      response.sendError(new WebDriverError(bot.ErrorCode.NO_SUCH_WINDOW,
         'Window not found. The browser window may have been closed.'));
+      return;
+    }
+  } catch (ff45) {
+    response.sendError(new WebDriverError(bot.ErrorCode.NO_SUCH_WINDOW,
+      'Window not found. The browser window may have been closed.'));
     return;
   }