From 82d584bac65b163177a5236824dfa061171cf07e Mon Sep 17 00:00:00 2001
From: Katrina Uychaco <kuychaco@github.com>
Date: Tue, 26 Jan 2016 22:52:30 -0700
Subject: [PATCH] Serialize in saveStateSync. Separate deserialization from
 deactivation.

---
 src/atom-environment.coffee | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/atom-environment.coffee b/src/atom-environment.coffee
index de52fe55c..110f51acb 100644
--- a/src/atom-environment.coffee
+++ b/src/atom-environment.coffee
@@ -636,16 +636,19 @@ class AtomEnvironment extends Model
 
     @openInitialEmptyEditorIfNecessary()
 
+  serialize: ->
+    @state.project = @project.serialize()
+    @state.workspace = @workspace.serialize()
+    @state.packageStates = @packages.serialize()
+    @state.grammars = {grammarOverridesByPath: @grammars.grammarOverridesByPath}
+    @state.fullScreen = @isFullScreen()
+
   unloadEditorWindow: ->
     return if not @project
 
     @storeWindowBackground()
-    @state.grammars = {grammarOverridesByPath: @grammars.grammarOverridesByPath}
-    @state.project = @project.serialize()
-    @state.workspace = @workspace.serialize()
+    @serialize()
     @packages.deactivatePackages()
-    @state.packageStates = @packages.packageStates
-    @state.fullScreen = @isFullScreen()
     @saveStateSync()
     @saveBlobStoreSync()
 
@@ -782,6 +785,7 @@ class AtomEnvironment extends Model
 
   saveStateSync: ->
     return unless @enablePersistence
+    @serialize()
 
     if storageKey = @getStateKey(@project?.getPaths())
       @getStorageFolder().store(storageKey, @state)