diff options
| author |  Dominik Guzei <dominik.guzei@gmail.com> | 2019-03-08 15:28:35 +0100 |
|---|---|---|
| committer | Dominik Guzei <dominik.guzei@gmail.com> | 2019-03-08 15:28:35 +0100 |
| commit | b6469566c2c88e8a61334d5d15a0f7c1afe08288 (patch) | |
| tree | f42dd4962c74057c6432866205b16c9d78a1c07e /src/electron | |
| parent | remove dev logs (diff) | |
| parent | correctly update services submenu on language change (diff) | |
| download | ferdium-app-b6469566c2c88e8a61334d5d15a0f7c1afe08288.tar.gz ferdium-app-b6469566c2c88e8a61334d5d15a0f7c1afe08288.tar.zst ferdium-app-b6469566c2c88e8a61334d5d15a0f7c1afe08288.zip | |
fix merge conflicts with latest develop
Diffstat (limited to 'src/electron')
| -rw-r--r-- | src/electron/ipc-api/autoUpdate.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/electron/ipc-api/autoUpdate.js b/src/electron/ipc-api/autoUpdate.js index 83dd83712..74b718734 100644 --- a/src/electron/ipc-api/autoUpdate.js +++ b/src/electron/ipc-api/autoUpdate.js | |||
| @@ -4,7 +4,7 @@ import { autoUpdater } from 'electron-updater'; | |||
| 4 | const debug = require('debug')('Franz:ipcApi:autoUpdate'); | 4 | const debug = require('debug')('Franz:ipcApi:autoUpdate'); |
| 5 | 5 | ||
| 6 | export default (params) => { | 6 | export default (params) => { |
| 7 | if (process.platform === 'darwin' || process.platform === 'win32') { | 7 | if (process.platform === 'darwin' || process.platform === 'win32' || process.env.APPIMAGE) { |
| 8 | ipcMain.on('autoUpdate', (event, args) => { | 8 | ipcMain.on('autoUpdate', (event, args) => { |
| 9 | try { | 9 | try { |
| 10 | autoUpdater.autoInstallOnAppQuit = false; | 10 | autoUpdater.autoInstallOnAppQuit = false; |