From c6652e1b2950e849926fd013ccca3d9608f79ac1 Mon Sep 17 00:00:00 2001
From: Ash Wilson <smashwilson@github.com>
Date: Thu, 18 Apr 2019 17:09:55 -0400
Subject: [PATCH] Don't restore state when --new-window is passed and other
 paths

---
 src/main-process/atom-application.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main-process/atom-application.js b/src/main-process/atom-application.js
index d657d9f22..065f3a626 100644
--- a/src/main-process/atom-application.js
+++ b/src/main-process/atom-application.js
@@ -246,12 +246,12 @@ class AtomApplication extends EventEmitter {
 
     if (options.test || options.benchmark || options.benchmarkTest) {
       optionsForWindowsToOpen.push(options)
+    } else if (options.newWindow) {
+      shouldReopenPreviousWindows = false
     } else if ((options.pathsToOpen && options.pathsToOpen.length > 0) ||
                (options.urlsToOpen && options.urlsToOpen.length > 0)) {
       optionsForWindowsToOpen.push(options)
       shouldReopenPreviousWindows = this.config.get('core.restorePreviousWindowsOnStart') === 'always'
-    } else if (options.newWindow) {
-      shouldReopenPreviousWindows = false
     } else {
       shouldReopenPreviousWindows = this.config.get('core.restorePreviousWindowsOnStart') !== 'no'
     }