From aa682d5b19756faf03510e7fea782dcb8359a3a4 Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@github.com>
Date: Tue, 6 Oct 2015 15:12:56 -0600
Subject: [PATCH] Restore initial styles in AtomEnvironment::reset

---
 spec/spec-helper.coffee     | 6 ++++--
 src/atom-environment.coffee | 3 +++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/spec/spec-helper.coffee b/spec/spec-helper.coffee
index 36bab14dd..261373a52 100644
--- a/spec/spec-helper.coffee
+++ b/spec/spec-helper.coffee
@@ -19,7 +19,10 @@ TextEditorComponent = require '../src/text-editor-component'
 pathwatcher = require 'pathwatcher'
 clipboard = require '../src/safe-clipboard'
 
-atom.themes.requireStylesheet '../static/jasmine'
+jasmineStyle = document.createElement('style')
+jasmineStyle.textContent = atom.themes.loadStylesheet(atom.themes.resolveStylesheet('../static/jasmine'))
+document.head.appendChild(jasmineStyle)
+
 atom.themes.initialLoadComplete = true
 
 fixturePackagesPath = path.resolve(__dirname, './fixtures/packages')
@@ -96,7 +99,6 @@ beforeEach ->
     assert: atom.assert.bind(atom)
   })
   atom.themes.workspace = atom.workspace
-  atom.styles.restoreSnapshot(styleElementsToRestore)
   atom.views.clearDocumentRequests()
 
   atom.workspaceParentSelectorctor = '#jasmine-content'
diff --git a/src/atom-environment.coffee b/src/atom-environment.coffee
index f2a3c8f2d..e21ea9ff0 100644
--- a/src/atom-environment.coffee
+++ b/src/atom-environment.coffee
@@ -156,6 +156,7 @@ class AtomEnvironment extends Model
       packageManager: @packages, configDirPath, resourcePath, safeMode, @config,
       styleManager: @styles, notificationManager: @notifications, viewRegistry: @views
     })
+    @initialStyleElements = @styles.getSnapshot()
 
     MenuManager = require './menu-manager'
     @menu = new MenuManager({resourcePath, keymapManager: @keymaps, packageManager: @packages})
@@ -242,6 +243,8 @@ class AtomEnvironment extends Model
     @commands.clear()
     registerDefaultCommands(this)
 
+    @styles.restoreSnapshot(@initialStyleElements)
+
   ###
   Section: Event Subscription
   ###