From e6368a566d0dbe89d05d626db13f96ca9af20e89 Mon Sep 17 00:00:00 2001
From: sadick254 <sadickjunior@gmail.com>
Date: Fri, 14 May 2021 10:21:04 +0300
Subject: [PATCH] Pass safeMode and devMode on reopening a project

Resolves: #19310
---
 src/atom-environment.js              | 7 ++++++-
 src/main-process/atom-application.js | 6 ++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/atom-environment.js b/src/atom-environment.js
index 4d7e627a2..ac7196437 100644
--- a/src/atom-environment.js
+++ b/src/atom-environment.js
@@ -1036,7 +1036,12 @@ class AtomEnvironment {
         commands: this.commands,
         history: this.history,
         config: this.config,
-        open: paths => this.open({ pathsToOpen: paths })
+        open: paths =>
+          this.open({
+            pathsToOpen: paths,
+            safeMode: this.inSafeMode(),
+            devMode: this.inDevMode()
+          })
       });
       this.reopenProjectMenuManager.update();
     });
diff --git a/src/main-process/atom-application.js b/src/main-process/atom-application.js
index ee28a56dc..a44988789 100644
--- a/src/main-process/atom-application.js
+++ b/src/main-process/atom-application.js
@@ -619,6 +619,12 @@ module.exports = class AtomApplication extends EventEmitter {
 
     if (process.platform === 'darwin') {
       this.on('application:reopen-project', ({ paths }) => {
+        const focusedWindow = this.focusedWindow();
+        if (focusedWindow) {
+          const { safeMode, devMode } = focusedWindow;
+          this.openPaths({ pathsToOpen: paths, safeMode, devMode });
+          return;
+        }
         this.openPaths({ pathsToOpen: paths });
       });