From f6ced98be873739dd4233ab16192019324dc5c4e Mon Sep 17 00:00:00 2001
From: Katrina Uychaco <kuychaco@github.com>
Date: Thu, 11 Feb 2016 11:43:41 -0800
Subject: [PATCH] Fix bug from merge with PR#10743

---
 src/atom-environment.coffee              | 20 +++++++++++---------
 src/initialize-application-window.coffee |  6 +++---
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/atom-environment.coffee b/src/atom-environment.coffee
index 2d7427ba0..f7869f9af 100644
--- a/src/atom-environment.coffee
+++ b/src/atom-environment.coffee
@@ -615,7 +615,7 @@ class AtomEnvironment extends Model
     # But after that, e.g., when the window's been reloaded, we want to use the
     # dimensions we've saved for it.
     if not @isFirstLoad()
-      dimensions = @state.windowDimensions
+      dimensions = @windowDimensions
 
     unless @isValidDimensions(dimensions)
       dimensions = @getDefaultWindowDimensions()
@@ -648,18 +648,18 @@ class AtomEnvironment extends Model
     @registerDefaultTargetForKeymaps()
 
     @packages.loadPackages()
-    @loadState().then =>
-      @document.body.appendChild(@views.getView(@workspace))
+    
+    @document.body.appendChild(@views.getView(@workspace))
 
-      @watchProjectPath()
+    @watchProjectPath()
 
-      @packages.activate()
-      @keymaps.loadUserKeymap()
-      @requireUserInitScript() unless @getLoadSettings().safeMode
+    @packages.activate()
+    @keymaps.loadUserKeymap()
+    @requireUserInitScript() unless @getLoadSettings().safeMode
 
-      @menu.update()
+    @menu.update()
 
-      @openInitialEmptyEditorIfNecessary()
+    @openInitialEmptyEditorIfNecessary()
 
   serialize: ->
     version: @constructor.version
@@ -846,6 +846,8 @@ class AtomEnvironment extends Model
 
     @setFullScreen(state.fullScreen)
 
+    @windowDimensions = state.windowDimensions if state.windowDimensions
+
     @packages.packageStates = state.packageStates ? {}
 
     startTime = Date.now()
diff --git a/src/initialize-application-window.coffee b/src/initialize-application-window.coffee
index 0044a8d18..e4fa4af4d 100644
--- a/src/initialize-application-window.coffee
+++ b/src/initialize-application-window.coffee
@@ -23,9 +23,9 @@ module.exports = ({blobStore}) ->
     enablePersistence: true
   })
 
-  atom.loadStateSync()
-  atom.displayWindow()
-  atom.startEditorWindow().then ->
+  atom.loadState().then ->
+    atom.displayWindow()
+    atom.startEditorWindow()
 
     # Workaround for focus getting cleared upon window creation
     windowFocused = ->