From f4b94fef30a952efda6997e28d4c53973196fd3d Mon Sep 17 00:00:00 2001 From: Jordan Tucker Date: Tue, 29 Mar 2016 08:30:18 -0700 Subject: [PATCH] always save state on close, check config on open --- src/browser/atom-application.coffee | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/browser/atom-application.coffee b/src/browser/atom-application.coffee index d057aef52..eea2fdc57 100644 --- a/src/browser/atom-application.coffee +++ b/src/browser/atom-application.coffee @@ -506,18 +506,17 @@ class AtomApplication saveState: (allowEmpty=false) -> return if @quitting - restorePreviousState = @config.get('core.restorePreviousWindowsOnStart') ? true states = [] - if restorePreviousState - for window in @windows - unless window.isSpec - if loadSettings = window.getLoadSettings() - states.push(initialPaths: loadSettings.initialPaths) - if states.length > 0 or allowEmpty or not restorePreviousState + for window in @windows + unless window.isSpec + if loadSettings = window.getLoadSettings() + states.push(initialPaths: loadSettings.initialPaths) + if states.length > 0 or allowEmpty @storageFolder.storeSync('application.json', states) loadState: (options) -> - if (states = @storageFolder.load('application.json'))?.length > 0 + restorePreviousState = @config.get('core.restorePreviousWindowsOnStart') ? true + if (states = @storageFolder.load('application.json'))?.length > 0 and restorePreviousState for state in states @openWithOptions(_.extend(options, { initialPaths: state.initialPaths