From 3eb55d7db0fd6260e73f1cd1dd1687221addd73c Mon Sep 17 00:00:00 2001
From: Damien Guard <damieng@gmail.com>
Date: Thu, 8 Sep 2016 21:16:55 -0700
Subject: [PATCH] Add Windows file.ico lost in move to new build

---
 script/lib/package-application.js        | 7 ++-----
 src/atom-environment.coffee              | 5 +++++
 src/main-process/atom-application.coffee | 5 +++++
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/script/lib/package-application.js b/script/lib/package-application.js
index 5c76da9c0..f48a5af2b 100644
--- a/script/lib/package-application.js
+++ b/script/lib/package-application.js
@@ -73,11 +73,8 @@ function copyNonASARResources (packagedAppPath, bundledResourcesPath) {
   } else if (process.platform === 'linux') {
     fs.copySync(path.join(CONFIG.repositoryRootPath, 'resources', 'app-icons', CONFIG.channel, 'png', '1024.png'), path.join(packagedAppPath, 'atom.png'))
   } else if (process.platform === 'win32') {
-    fs.copySync(path.join('resources', 'win', 'atom.cmd'), path.join(bundledResourcesPath, 'cli', 'atom.cmd'))
-    fs.copySync(path.join('resources', 'win', 'atom.sh'), path.join(bundledResourcesPath, 'cli', 'atom.sh'))
-    fs.copySync(path.join('resources', 'win', 'atom.js'), path.join(bundledResourcesPath, 'cli', 'atom.js'))
-    fs.copySync(path.join('resources', 'win', 'apm.cmd'), path.join(bundledResourcesPath, 'cli', 'apm.cmd'))
-    fs.copySync(path.join('resources', 'win', 'apm.sh'), path.join(bundledResourcesPath, 'cli', 'apm.sh'))
+    [ 'atom.cmd', 'atom.sh', 'atom.js', 'apm.cmd', 'apm.sh', 'file.ico' ]
+      .forEach(file => fs.copySync(path.join('resources', 'win', file), path.join(bundledResourcesPath, 'cli', file)))
   }
 
   console.log(`Writing LICENSE.md to ${bundledResourcesPath}`)
diff --git a/src/atom-environment.coffee b/src/atom-environment.coffee
index f84e90469..0cf8ec754 100644
--- a/src/atom-environment.coffee
+++ b/src/atom-environment.coffee
@@ -854,16 +854,21 @@ class AtomEnvironment extends Model
     @blobStore.save()
 
   saveState: (options) ->
+    console.log('environment.saveState\n')
     new Promise (resolve, reject) =>
       if @enablePersistence and @project
         state = @serialize(options)
+        console.log('environment.saveState serialized\n')
         savePromise =
           if storageKey = @getStateKey(@project?.getPaths())
             @stateStore.save(storageKey, state)
+            console.log('environment.saveState saved\n')
           else
             @applicationDelegate.setTemporaryWindowState(state)
+        console.log('environment.saveState caching\n')
         savePromise.catch(reject).then(resolve)
       else
+        console.log('environment.saveState resolving\n')
         resolve()
 
   loadState: ->
diff --git a/src/main-process/atom-application.coffee b/src/main-process/atom-application.coffee
index 701710337..ee72533af 100644
--- a/src/main-process/atom-application.coffee
+++ b/src/main-process/atom-application.coffee
@@ -96,10 +96,13 @@ class AtomApplication
     @launch(options)
 
   destroy: ->
+    console.log('application-destroy\n')
     windowsClosePromises = @windows.map (window) ->
       window.close()
       window.closedPromise
+    console.log('application-destroy promising\n')
     Promise.all(windowsClosePromises).then(=> @disposable.dispose())
+    console.log('application-destroy complete\n')
 
   launch: (options) ->
     if options.pathsToOpen?.length > 0 or options.urlsToOpen?.length > 0 or options.test
@@ -323,9 +326,11 @@ class AtomApplication
       win.temporaryState = state
 
     @disposable.add ipcHelpers.on ipcMain, 'did-cancel-window-unload', =>
+      console.log('did-cancel-window-unload\n')
       @quitting = false
       for window in @windows
         window.didCancelWindowUnload()
+      console.log('did-cancel-window-unload done\n')
 
     clipboard = require '../safe-clipboard'
     @disposable.add ipcHelpers.on ipcMain, 'write-text-to-selection-clipboard', (event, selectedText) ->