summaryrefslogtreecommitdiffstats
path: root/src/electron
diff options
context:
space:
mode:
Diffstat (limited to 'src/electron')
-rw-r--r--src/electron/Settings.ts6
-rw-r--r--src/electron/ipc-api/autoUpdate.ts8
-rw-r--r--src/electron/ipc-api/download.ts12
3 files changed, 13 insertions, 13 deletions
diff --git a/src/electron/Settings.ts b/src/electron/Settings.ts
index 3e9c6ed99..7bb12338e 100644
--- a/src/electron/Settings.ts
+++ b/src/electron/Settings.ts
@@ -18,10 +18,10 @@ export default class Settings {
18 this.store = defaultState; 18 this.store = defaultState;
19 this.defaultState = defaultState; 19 this.defaultState = defaultState;
20 20
21 if (!pathExistsSync(this.settingsFile)) { 21 if (pathExistsSync(this.settingsFile)) {
22 this._writeFile();
23 } else {
24 this._hydrate(); 22 this._hydrate();
23 } else {
24 this._writeFile();
25 } 25 }
26 } 26 }
27 27
diff --git a/src/electron/ipc-api/autoUpdate.ts b/src/electron/ipc-api/autoUpdate.ts
index bf3e79c85..14214aacb 100644
--- a/src/electron/ipc-api/autoUpdate.ts
+++ b/src/electron/ipc-api/autoUpdate.ts
@@ -7,10 +7,7 @@ const debug = require('../../preload-safe-debug')('Ferdium:ipcApi:autoUpdate');
7export default (params: { mainWindow: BrowserWindow; settings: any }) => { 7export default (params: { mainWindow: BrowserWindow; settings: any }) => {
8 const enableUpdate = Boolean(params.settings.app.get('automaticUpdates')); 8 const enableUpdate = Boolean(params.settings.app.get('automaticUpdates'));
9 9
10 if (!enableUpdate) { 10 if (enableUpdate) {
11 autoUpdater.autoInstallOnAppQuit = false;
12 autoUpdater.autoDownload = false;
13 } else {
14 ipcMain.on('autoUpdate', (event, args) => { 11 ipcMain.on('autoUpdate', (event, args) => {
15 if (enableUpdate) { 12 if (enableUpdate) {
16 try { 13 try {
@@ -71,5 +68,8 @@ export default (params: { mainWindow: BrowserWindow; settings: any }) => {
71 debug('update-error'); 68 debug('update-error');
72 params.mainWindow.webContents.send('autoUpdate', { error }); 69 params.mainWindow.webContents.send('autoUpdate', { error });
73 }); 70 });
71 } else {
72 autoUpdater.autoInstallOnAppQuit = false;
73 autoUpdater.autoDownload = false;
74 } 74 }
75}; 75};
diff --git a/src/electron/ipc-api/download.ts b/src/electron/ipc-api/download.ts
index 21af0d045..518a7091c 100644
--- a/src/electron/ipc-api/download.ts
+++ b/src/electron/ipc-api/download.ts
@@ -23,12 +23,7 @@ export default (params: { mainWindow: BrowserWindow }) => {
23 const win = BrowserWindow.getFocusedWindow(); 23 const win = BrowserWindow.getFocusedWindow();
24 24
25 try { 25 try {
26 if (!content) { 26 if (content) {
27 const dl = await download(win!, url, {
28 saveAs: true,
29 });
30 debug('File saved to', dl.savePath);
31 } else {
32 const extension = mime.extension(fileOptions.mime); 27 const extension = mime.extension(fileOptions.mime);
33 const filename = `${fileOptions.name}.${extension}`; 28 const filename = `${fileOptions.name}.${extension}`;
34 29
@@ -50,6 +45,11 @@ export default (params: { mainWindow: BrowserWindow }) => {
50 } catch (error) { 45 } catch (error) {
51 console.error(error); 46 console.error(error);
52 } 47 }
48 } else {
49 const dl = await download(win!, url, {
50 saveAs: true,
51 });
52 debug('File saved to', dl.savePath);
53 } 53 }
54 } catch (error) { 54 } catch (error) {
55 console.error(error); 55 console.error(error);