From 30fdb70dfd2a684835b763e47e980d1c271ad086 Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Tue, 20 Sep 2016 09:53:54 -0700
Subject: [PATCH] Initialize app-started promise before reloading AtomWindow

---
 src/main-process/atom-window.coffee | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main-process/atom-window.coffee b/src/main-process/atom-window.coffee
index 78a9365f2..5802bdf8d 100644
--- a/src/main-process/atom-window.coffee
+++ b/src/main-process/atom-window.coffee
@@ -255,8 +255,9 @@ class AtomWindow
   isSpecWindow: -> @isSpec
 
   reload: ->
-    @browserWindow.reload()
     @applicationStartedPromise = new Promise (resolve) =>
       @browserWindow.once('window:application-started', resolve)
+    @browserWindow.reload()
+    @applicationStartedPromise
 
   toggleDevTools: -> @browserWindow.toggleDevTools()