From 7a5d727e224a7a5fa9c45a1979bb1758c12d8b20 Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Wed, 18 Apr 2018 10:46:38 -0700 Subject: [PATCH] Avoid writing to config file while quitting --- src/main-process/atom-application.js | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main-process/atom-application.js b/src/main-process/atom-application.js index 8345626a8..9d3c45030 100644 --- a/src/main-process/atom-application.js +++ b/src/main-process/atom-application.js @@ -439,7 +439,11 @@ class AtomApplication extends EventEmitter { event.preventDefault() const windowUnloadPromises = this.getAllWindows().map(window => window.prepareToUnload()) const windowUnloadedResults = await Promise.all(windowUnloadPromises) - if (windowUnloadedResults.every(Boolean)) app.quit() + if (windowUnloadedResults.every(Boolean)) { + app.quit() + } else { + this.quitting = false + } } resolveBeforeQuitPromise() @@ -563,9 +567,11 @@ class AtomApplication extends EventEmitter { window.setPosition(x, y) })) - this.disposable.add(ipcHelpers.respondTo('set-user-settings', (window, settings, filePath) => - ConfigFile.at(filePath || this.configFilePath).update(JSON.parse(settings)) - )) + this.disposable.add(ipcHelpers.respondTo('set-user-settings', (window, settings, filePath) => { + if (!this.quitting) { + ConfigFile.at(filePath || this.configFilePath).update(JSON.parse(settings)) + } + })) this.disposable.add(ipcHelpers.respondTo('center-window', window => window.center())) this.disposable.add(ipcHelpers.respondTo('focus-window', window => window.focus()))