fix: create userDataDir on requestSingleInstanceLock() if needed

electron · Apr 1, 2022 · aa00bfd · aa00bfd
1 parent b2e7aea
commit aa00bfd
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/shell/browser/api/electron_api_app.cc b/shell/browser/api/electron_api_app.cc
@@ -1148,6 +1148,8 @@ bool App::RequestSingleInstanceLock(gin::Arguments* args) {
 
   base::FilePath user_dir;
   base::PathService::Get(chrome::DIR_USER_DATA, &user_dir);
+  // The user_dir may not have been created yet.
+  base::CreateDirectoryAndGetError(user_dir, nullptr);
 
   auto cb = base::BindRepeating(&App::OnSecondInstance, base::Unretained(this));
   auto wrapped_cb = base::BindRepeating(NotificationCallbackWrapper, cb);

diff --git a/spec-main/api-app-spec.ts b/spec-main/api-app-spec.ts
@@ -228,7 +228,7 @@ describe('app module', () => {
       expect(code1).to.equal(0);
     });
 
-    it.only('returns true when setting non-existent user data folder', async function () {
+    it('returns true when setting non-existent user data folder', async function () {
       const appPath = path.join(fixturesPath, 'api', 'singleton-userdata');
       const instance = cp.spawn(process.execPath, [appPath]);
       const [code] = await emittedOnce(instance, 'exit');

diff --git a/spec/fixtures/api/singleton-userdata/main.js b/spec/fixtures/api/singleton-userdata/main.js
@@ -2,7 +2,7 @@ const { app } = require('electron');
 const fs = require('fs');
 const path = require('path');
 
-// non-existing user data folder should not break requestSingleInstanceLock()
+// non-existent user data folder should not break requestSingleInstanceLock()
 // ref: https://github.com/electron/electron/issues/33547
 const userDataFolder = path.join(app.getPath('home'), 'electron-test-singleton-userdata');
 fs.rmSync(userDataFolder, { force: true, recursive: true });