diff options
author | 2019-02-22 16:24:32 +0100 | |
---|---|---|
committer | 2019-02-22 16:24:32 +0100 | |
commit | 550f66ce9155c04eb48af506c8d7832bbce8ac91 (patch) | |
tree | 4371dbf0199bc00417face999bbec02afacfab71 /src/config.js | |
parent | adds flow for deleting workspaces (diff) | |
parent | Merge branch 'master' into develop (diff) | |
download | ferdium-app-550f66ce9155c04eb48af506c8d7832bbce8ac91.tar.gz ferdium-app-550f66ce9155c04eb48af506c8d7832bbce8ac91.tar.zst ferdium-app-550f66ce9155c04eb48af506c8d7832bbce8ac91.zip |
Merge branch 'develop' into feature/workspaces
Diffstat (limited to 'src/config.js')
-rw-r--r-- | src/config.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/config.js b/src/config.js index d327185f0..3696354c6 100644 --- a/src/config.js +++ b/src/config.js | |||
@@ -1,5 +1,6 @@ | |||
1 | import electron from 'electron'; | 1 | import electron from 'electron'; |
2 | import path from 'path'; | 2 | import path from 'path'; |
3 | import { asarPath } from './helpers/asar-helpers'; | ||
3 | 4 | ||
4 | const app = process.type === 'renderer' ? electron.remote.app : electron.app; | 5 | const app = process.type === 'renderer' ? electron.remote.app : electron.app; |
5 | const systemPreferences = process.type === 'renderer' ? electron.remote.systemPreferences : electron.systemPreferences; | 6 | const systemPreferences = process.type === 'renderer' ? electron.remote.systemPreferences : electron.systemPreferences; |
@@ -59,4 +60,4 @@ export const FILE_SYSTEM_SETTINGS_TYPES = [ | |||
59 | export const SETTINGS_PATH = path.join(app.getPath('userData'), 'config'); | 60 | export const SETTINGS_PATH = path.join(app.getPath('userData'), 'config'); |
60 | 61 | ||
61 | // Replacing app.asar is not beautiful but unforunately necessary | 62 | // Replacing app.asar is not beautiful but unforunately necessary |
62 | export const DICTIONARY_PATH = path.join(__dirname, 'dictionaries').replace('app.asar', 'app.asar.unpacked'); | 63 | export const DICTIONARY_PATH = asarPath(path.join(__dirname, 'dictionaries')); |