github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-04-28 03:01:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Make StorageFolder.load, AtomApplication.launch async

Browse Source 
Signed-off-by: Nathan Sobo <nathan@github.com>
This commit is contained in:
Max Brunsfeld
2018-01-19 11:52:25 -08:00
committed by Nathan Sobo
parent e2ad4e6a8b
commit 61e53834e6
3 changed files with 65 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main-process/atom-application.js
View File

@@ -169,17 +169,17 @@ class AtomApplication extends EventEmitter {
this.disposable.dispose()
}
launch (options) {
async launch (options) {
if (options.test || options.benchmark || options.benchmarkTest) {
return this.openWithOptions(options)
} else if ((options.pathsToOpen && options.pathsToOpen.length > 0) ||
(options.urlsToOpen && options.urlsToOpen.length > 0)) {
if (this.config.get('core.restorePreviousWindowsOnStart') === 'always') {
this.loadState(_.deepClone(options))
await this.loadState(_.deepClone(options))
}
return this.openWithOptions(options)
} else {
return this.loadState(options) || this.openPath(options)
return (await this.loadState(options)) || this.openPath(options)
}
}
@@ -924,8 +924,8 @@ class AtomApplication extends EventEmitter {
}
}
loadState (options) {
const states = this.storageFolder.load('application.json')
async loadState (options) {
const states = await this.storageFolder.load('application.json')
if (
['yes', 'always'].includes(this.config.get('core.restorePreviousWindowsOnStart')) &&
states && states.length > 0