From 8bd409ede3049784ac92b1860e242193ce693862 Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <as-cii@github.com>
Date: Sat, 11 Mar 2017 18:50:13 +0100
Subject: [PATCH] Fix dev mode

---
 src/atom-environment.coffee  | 11 ++++++++---
 src/keymap-extensions.coffee |  3 +++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/atom-environment.coffee b/src/atom-environment.coffee
index 08f39f2d3..a60c1febb 100644
--- a/src/atom-environment.coffee
+++ b/src/atom-environment.coffee
@@ -187,7 +187,9 @@ class AtomEnvironment extends Model
 
     @autoUpdater = new AutoUpdateManager({@applicationDelegate})
 
-    @keymaps.loadBundledKeymaps()
+    if @keymaps.canLoadBundledKeymapsFromMemory()
+      @keymaps.loadBundledKeymaps()
+
     @registerDefaultCommands()
     @registerDefaultOpeners()
     @registerDefaultDeserializers()
@@ -217,8 +219,13 @@ class AtomEnvironment extends Model
     }
     @config.initialize({@configDirPath, resourcePath, projectHomeSchema: ConfigSchema.projectHome})
 
+    @menu.initialize({resourcePath})
+    @contextMenu.initialize({resourcePath, devMode})
+
     @keymaps.configDirPath = @configDirPath
     @keymaps.resourcePath = resourcePath
+    unless @keymaps.canLoadBundledKeymapsFromMemory()
+      @keymaps.loadBundledKeymaps()
 
     @commands.attach(@window)
 
@@ -226,8 +233,6 @@ class AtomEnvironment extends Model
     @packages.initialize({devMode, @configDirPath, resourcePath, safeMode})
     @themes.initialize({@configDirPath, resourcePath, safeMode})
 
-    @menu.initialize({resourcePath})
-    @contextMenu.initialize({resourcePath, devMode})
     @commandInstaller.initialize(@getVersion())
     @workspace.initialize()
     @autoUpdater.initialize()
diff --git a/src/keymap-extensions.coffee b/src/keymap-extensions.coffee
index 76b2e8958..93320ab89 100644
--- a/src/keymap-extensions.coffee
+++ b/src/keymap-extensions.coffee
@@ -11,6 +11,9 @@ KeymapManager::onDidLoadBundledKeymaps = (callback) ->
 KeymapManager::onDidLoadUserKeymap = (callback) ->
   @emitter.on 'did-load-user-keymap', callback
 
+KeymapManager::canLoadBundledKeymapsFromMemory = ->
+  bundledKeymaps?
+
 KeymapManager::loadBundledKeymaps = ->
   if bundledKeymaps?
     for keymapName, keymap of bundledKeymaps