Merge pull request #19354 from atom/ns/fix-restart-prompt

Wait for config file to load before prompting to restart in config.onDidChange callback
atom · May 17, 2019 · 9ced07e · 9ced07e
2 parents fb961df + d5c84e5
commit 9ced07e
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/src/main-process/atom-application.js b/src/main-process/atom-application.js
@@ -271,17 +271,17 @@ class AtomApplication extends EventEmitter {
 
   async launch (options) {
     if (!this.configFilePromise) {
-      this.configFilePromise = this.configFile.watch()
+      this.configFilePromise = this.configFile.watch().then(disposable => {
+        this.disposable.add(disposable)
+        this.config.onDidChange('core.titleBar', () => this.promptForRestart())
+        this.config.onDidChange('core.colorProfile', () => this.promptForRestart())
+      })
 
       // TodoElectronIssue: In electron v2 awaiting the watcher causes some delay
       // in Windows machines, which affects directly the startup time.
-      if (process.platform === 'win32') {
-        this.configFilePromise.then(disposable => this.disposable.add(disposable))
-      } else {
-        this.disposable.add(await this.configFilePromise)
+      if (process.platform !== 'win32') {
+        await this.configFilePromise
       }
-      this.config.onDidChange('core.titleBar', () => this.promptForRestart())
-      this.config.onDidChange('core.colorProfile', () => this.promptForRestart())
     }
 
     let optionsForWindowsToOpen = []