aboutsummaryrefslogtreecommitdiffstats
path: root/src/electron
diff options
context:
space:
mode:
authorLibravatar Stefan Malzner <stefan@adlk.io>2018-01-17 10:34:22 +0400
committerLibravatar GitHub <noreply@github.com>2018-01-17 10:34:22 +0400
commit81b49fba430959ec4e0946f905dc182d2733831c (patch)
treea1979dafda41ac804986ef57a68912a868cb5ac7 /src/electron
parentRemove idle timer dependency (diff)
parentMerge branch 'develop' of github.com:meetfranz/franz into develop (diff)
downloadferdium-app-81b49fba430959ec4e0946f905dc182d2733831c.tar.gz
ferdium-app-81b49fba430959ec4e0946f905dc182d2733831c.tar.zst
ferdium-app-81b49fba430959ec4e0946f905dc182d2733831c.zip
Merge branch 'develop' into feature/remove-miner
Diffstat (limited to 'src/electron')
-rw-r--r--src/electron/ipc-api/autoUpdate.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/electron/ipc-api/autoUpdate.js b/src/electron/ipc-api/autoUpdate.js
index 7bc193e2d..ba49a2f97 100644
--- a/src/electron/ipc-api/autoUpdate.js
+++ b/src/electron/ipc-api/autoUpdate.js
@@ -1,8 +1,9 @@
1import { app, ipcMain } from 'electron'; 1import { app, ipcMain } from 'electron';
2import { autoUpdater } from 'electron-updater'; 2import { autoUpdater } from 'electron-updater';
3import { isDevMode } from '../../environment.js';
3 4
4export default (params) => { 5export default (params) => {
5 if (process.platform === 'darwin' || process.platform === 'win32') { 6 if (!isDevMode && (process.platform === 'darwin' || process.platform === 'win32')) {
6 // autoUpdater.setFeedURL(updateUrl); 7 // autoUpdater.setFeedURL(updateUrl);
7 ipcMain.on('autoUpdate', (event, args) => { 8 ipcMain.on('autoUpdate', (event, args) => {
8 try { 9 try {