Only prevent unload the first time it is attempted

2016-08-03 12:44:18 -07:00 · 2016-08-03 12:44:18 -07:00 · cce6be1900
--- a/spec/fixtures/api/beforeunload-false.html
+++ b/spec/fixtures/api/beforeunload-false.html
@ -1,11 +1,16 @@
 <html>
 <body>
 <script type="text/javascript" charset="utf-8">
+  // Only prevent unload on the first window close
+  var unloadPrevented = false;
  window.onbeforeunload = function() {
    setTimeout(function() {
      require('electron').remote.getCurrentWindow().emit('onbeforeunload');
    }, 0);
-    return false;
+    if (!unloadPrevented) {
+      unloadPrevented = true;
+      return false;
+    }
  }
 </script>
 </body>
--- a/spec/fixtures/api/close-beforeunload-empty-string.html
+++ b/spec/fixtures/api/close-beforeunload-empty-string.html
@ -1,11 +1,17 @@
 <html>
 <body>
 <script type="text/javascript" charset="utf-8">
+  // Only prevent unload on the first window close
+  var unloadPrevented = false;
  window.onbeforeunload = function() {
    setTimeout(function() {
      require('electron').remote.getCurrentWindow().emit('onbeforeunload');
    }, 0);
-    return '';
+
+    if (!unloadPrevented) {
+      unloadPrevented = true;
+      return '';
+    }
  }
  window.close();
 </script>
--- a/spec/fixtures/api/close-beforeunload-false.html
+++ b/spec/fixtures/api/close-beforeunload-false.html
@ -1,11 +1,16 @@
 <html>
 <body>
 <script type="text/javascript" charset="utf-8">
+  // Only prevent unload on the first window close
+  var unloadPrevented = false;
  window.onbeforeunload = function() {
    setTimeout(function() {
      require('electron').remote.getCurrentWindow().emit('onbeforeunload');
    }, 0);
-    return false;
+    if (!unloadPrevented) {
+      unloadPrevented = true;
+      return false;
+    }
  }
  window.close();
 </script>