From 97c2fc09f012472ec138ecde05cc6547e2ee1b20 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Mon, 11 Aug 2014 12:43:15 -0700
Subject: [PATCH] Only unload editor window when confirmed

---
 src/atom.coffee                 |  5 -----
 src/window-event-handler.coffee | 16 +++++++++-------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/atom.coffee b/src/atom.coffee
index f21162534..c295d5394 100644
--- a/src/atom.coffee
+++ b/src/atom.coffee
@@ -311,11 +311,6 @@ class Atom extends Model
     @requireUserInitScript()
     @menu.update()
 
-    $(window).on 'beforeunload', =>
-      $(document.body).css('visibility', 'hidden')
-      @unloadEditorWindow()
-      null
-
     @displayWindow()
 
   unloadEditorWindow: ->
diff --git a/src/window-event-handler.coffee b/src/window-event-handler.coffee
index 23e045314..8f37c7ae4 100644
--- a/src/window-event-handler.coffee
+++ b/src/window-event-handler.coffee
@@ -35,15 +35,17 @@ class WindowEventHandler
       confirmed = atom.workspaceView?.confirmClose()
       atom.hide() if confirmed and not @reloadRequested and atom.getCurrentWindow().isWebViewFocused()
       @reloadRequested = false
+
+      atom.storeDefaultWindowDimensions()
+      atom.storeWindowDimensions()
+
+      if confirmed
+        $(document.body).css('visibility', 'hidden')
+        atom.unloadEditorWindow()
+
       confirmed
 
-    @subscribe $(window), 'blur beforeunload', ->
-      atom.storeDefaultWindowDimensions()
-      null
-
-    @subscribe $(window), 'beforeunload', ->
-      atom.storeWindowDimensions()
-      null
+    @subscribe $(window), 'blur', -> atom.storeDefaultWindowDimensions()
 
     @subscribeToCommand $(window), 'window:toggle-full-screen', -> atom.toggleFullScreen()