From 68b7bf46dd051a042802b4d8b86ec7fd3b3f596e Mon Sep 17 00:00:00 2001 From: Damien Guard Date: Tue, 11 Jul 2017 17:04:54 -0700 Subject: [PATCH] Make loadSettings a property so we can change it --- src/main-process/atom-window.coffee | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/main-process/atom-window.coffee b/src/main-process/atom-window.coffee index b0b516b10..5d1add870 100644 --- a/src/main-process/atom-window.coffee +++ b/src/main-process/atom-window.coffee @@ -54,14 +54,14 @@ class AtomWindow @browserWindow = new BrowserWindow(options) @handleEvents() - loadSettings = Object.assign({}, settings) - loadSettings.appVersion = app.getVersion() - loadSettings.resourcePath = @resourcePath - loadSettings.devMode ?= false - loadSettings.safeMode ?= false - loadSettings.atomHome = process.env.ATOM_HOME - loadSettings.clearWindowState ?= false - loadSettings.initialPaths ?= + @loadSettings = Object.assign({}, settings) + @loadSettings.appVersion = app.getVersion() + @loadSettings.resourcePath = @resourcePath + @loadSettings.devMode ?= false + @loadSettings.safeMode ?= false + @loadSettings.atomHome = process.env.ATOM_HOME + @loadSettings.clearWindowState ?= false + @loadSettings.initialPaths ?= for {pathToOpen} in locationsToOpen when pathToOpen stat = fs.statSyncNoException(pathToOpen) or null if stat?.isDirectory() @@ -72,17 +72,17 @@ class AtomWindow parentDirectory else pathToOpen - loadSettings.initialPaths.sort() + @loadSettings.initialPaths.sort() # Only send to the first non-spec window created if @constructor.includeShellLoadTime and not @isSpec @constructor.includeShellLoadTime = false - loadSettings.shellLoadTime ?= Date.now() - global.shellStartTime + @loadSettings.shellLoadTime ?= Date.now() - global.shellStartTime - @representedDirectoryPaths = loadSettings.initialPaths - @env = loadSettings.env if loadSettings.env? + @representedDirectoryPaths = @loadSettings.initialPaths + @env = @loadSettings.env if @loadSettings.env? - @browserWindow.loadSettingsJSON = JSON.stringify(loadSettings) + @browserWindow.loadSettingsJSON = JSON.stringify(@loadSettings) @browserWindow.on 'window:loaded', => @disableZoom()