summaryrefslogtreecommitdiffhomepage
path: root/gui/src
diff options
context:
space:
mode:
authorDavid Lönnhager <david.l@mullvad.net>2022-01-20 10:55:27 +0100
committerDavid Lönnhager <david.l@mullvad.net>2022-01-20 10:55:27 +0100
commit19386d5a70c52618badfeb670c603bb708fab8c5 (patch)
tree52ea154528e99cd366651aaa6a87b73ff1aeed8a /gui/src
parent4e64c21bf32fe0afedf5669c528d6c29823c1aae (diff)
parentebb1742335f1f63285241b1d7d1ac92464609f42 (diff)
downloadmullvadvpn-19386d5a70c52618badfeb670c603bb708fab8c5.tar.xz
mullvadvpn-19386d5a70c52618badfeb670c603bb708fab8c5.zip
Merge branch 'electron-workaround-appdata-lock-error'
Diffstat (limited to 'gui/src')
-rw-r--r--gui/src/main/index.ts5
1 files changed, 4 insertions, 1 deletions
diff --git a/gui/src/main/index.ts b/gui/src/main/index.ts
index a3cd2dd5f8..5e361da04c 100644
--- a/gui/src/main/index.ts
+++ b/gui/src/main/index.ts
@@ -13,6 +13,7 @@ import {
systemPreferences,
Tray,
} from 'electron';
+import fs from 'fs';
import * as path from 'path';
import util from 'util';
import config from '../config.json';
@@ -336,9 +337,11 @@ class ApplicationMain {
if (process.platform === 'win32') {
const appDataDir = process.env.LOCALAPPDATA;
if (appDataDir) {
+ const userData = path.join(appDataDir, app.name);
app.setPath('appData', appDataDir);
- app.setPath('userData', path.join(appDataDir, app.name));
+ app.setPath('userData', userData);
app.setPath('logs', path.join(appDataDir, app.name, 'logs'));
+ fs.mkdirSync(userData, { recursive: true });
} else {
throw new Error('Missing %LOCALAPPDATA% environment variable');
}