From 1a8beef74fc415a77b65aff71efd3fc9a1545294 Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <me@as-cii.com>
Date: Fri, 9 Oct 2015 18:37:24 +0200
Subject: [PATCH] :bug: Load config schema before loading base stylesheets

---
 src/atom-environment.coffee | 5 ++++-
 src/theme-manager.coffee    | 1 -
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/atom-environment.coffee b/src/atom-environment.coffee
index 9571e38c1..b3e0eabfe 100644
--- a/src/atom-environment.coffee
+++ b/src/atom-environment.coffee
@@ -126,6 +126,7 @@ class AtomEnvironment extends Model
 
     Config = require './config'
     @config = new Config({configDirPath, resourcePath, notificationManager: @notifications})
+    @setConfigSchema()
 
     KeymapManager = require './keymap-extensions'
     @keymaps = new KeymapManager({configDirPath, resourcePath, notificationManager: @notifications})
@@ -177,11 +178,12 @@ class AtomEnvironment extends Model
     })
     @themes.workspace = @workspace
 
+    @themes.loadBaseStylesheets()
     @initialStyleElements = @styles.getSnapshot()
 
-    @setConfigSchema()
     @keymaps.subscribeToFileReadFailure()
     @keymaps.loadBundledKeymaps()
+
     registerDefaultCommands(this)
     @registerDefaultOpeners()
     @registerDefaultDeserializers()
@@ -585,6 +587,7 @@ class AtomEnvironment extends Model
 
     stylesElement = new StylesElement
     stylesElement.initialize(this)
+
     document.head.appendChild(stylesElement)
     @windowEventHandler = new WindowEventHandler(this)
 
diff --git a/src/theme-manager.coffee b/src/theme-manager.coffee
index 4ccee0a4c..649478841 100644
--- a/src/theme-manager.coffee
+++ b/src/theme-manager.coffee
@@ -17,7 +17,6 @@ class ThemeManager
     @packageManager.registerPackageActivator(this, ['theme'])
     @packageManager.onDidActivateInitialPackages =>
       @onDidChangeActiveThemes => @packageManager.reloadActivePackageStyleSheets()
-    @loadBaseStylesheets()
 
   ###
   Section: Event Subscription