diff --git a/spec/main-process/atom-application.new.test.js b/spec/main-process/atom-application.new.test.js index f2ffe372c..cc86c7f6e 100644 --- a/spec/main-process/atom-application.new.test.js +++ b/spec/main-process/atom-application.new.test.js @@ -597,6 +597,7 @@ class LaunchScenario { if (options.pathsToOpen) { options.pathsToOpen = this.convertPaths(options.pathsToOpen) } + options.preserveFocus = true const window = await app.openWithOptions(options) this.windows.add(window) @@ -719,6 +720,7 @@ class LaunchScenario { const app = new AtomApplication({ resourcePath: path.resolve(__dirname, '../..'), atomHomeDirPath: this.atomHome, + preserveFocus: true, ...options }) this.sinon.stub(app, 'createWindow', loadSettings => new StubWindow(this.sinon, loadSettings, options)) diff --git a/src/main-process/atom-application.js b/src/main-process/atom-application.js index 065f3a626..a90208b21 100644 --- a/src/main-process/atom-application.js +++ b/src/main-process/atom-application.js @@ -292,10 +292,13 @@ class AtomApplication extends EventEmitter { timeout, clearWindowState, addToLastWindow, + preserveFocus, env } = options - app.focus() + if (!preserveFocus) { + app.focus() + } if (test) { return this.runTests({