From 3d5f6c858d3d6ceb84946f41933bac325392942d Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@github.com>
Date: Fri, 2 Oct 2015 12:54:23 -0600
Subject: [PATCH] Move grammar override assignment into loadStateSync

Signed-off-by: Max Brunsfeld <maxbrunsfeld@github.com>
---
 src/atom.coffee | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/atom.coffee b/src/atom.coffee
index a6624c5bb..f494e6114 100644
--- a/src/atom.coffee
+++ b/src/atom.coffee
@@ -667,9 +667,6 @@ class Atom extends Model
     document.querySelector(@workspaceParentSelectorctor).appendChild(workspaceElement)
 
   deserializeEditorWindow: ->
-    if grammarOverridesByPath = @state.grammars?.grammarOverridesByPath
-      @grammars.grammarOverridesByPath = grammarOverridesByPath
-
     @deserializeWorkspace()
 
   loadThemes: ->
@@ -731,6 +728,9 @@ class Atom extends Model
 
     @deserializeTimings.atom = Date.now() -  startTime
 
+    if grammarOverridesByPath = @state.grammars?.grammarOverridesByPath
+      @grammars.grammarOverridesByPath = grammarOverridesByPath
+
     @packages.packageStates = @state.packageStates ? {}
 
     startTime = Date.now()