From a0f68ec978fdd0c2eb46caca0bd1eea9a9ef9958 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Tue, 3 Nov 2015 14:35:30 -0800 Subject: [PATCH] Setup ATOM_HOME immediately after parsing load settings --- static/index.js | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/static/index.js b/static/index.js index a10a11182..efca711f4 100644 --- a/static/index.js +++ b/static/index.js @@ -15,13 +15,6 @@ console.error('Unhandled promise rejection %o with error: %o', promise, error) }) - // Ensure ATOM_HOME is always set before anything else is required - // This is because of a difference in Linux not inherited between browser and render processes - // issue #5142 - if (loadSettings && loadSettings.atomHome) { - process.env.ATOM_HOME = loadSettings.atomHome - } - blobStore = FileSystemBlobStore.load( path.join(process.env.ATOM_HOME, 'blob-store/') ) @@ -176,6 +169,16 @@ }, false) } + var setupAtomHome = function () { + // Ensure ATOM_HOME is always set before anything else is required + // This is because of a difference in Linux not inherited between browser and render processes + // issue #5142 + if (loadSettings && loadSettings.atomHome) { + process.env.ATOM_HOME = loadSettings.atomHome + } + } + parseLoadSettings() + setupAtomHome() setupWindowBackground() })()