aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLibravatar Stefan Malzner <stefan@adlk.io>2018-12-02 00:56:19 +0100
committerLibravatar Stefan Malzner <stefan@adlk.io>2018-12-02 00:56:19 +0100
commited9d02c63118f673719fdf3e57492aa5aa53f2b7 (patch)
treeb895f26252a0c4e54a1a083e17275fab9b32f9a4 /src
parentMerge branch 'develop' into release/5.0.0-beta.19 (diff)
parentFix linting issues (diff)
downloadferdium-app-ed9d02c63118f673719fdf3e57492aa5aa53f2b7.tar.gz
ferdium-app-ed9d02c63118f673719fdf3e57492aa5aa53f2b7.tar.zst
ferdium-app-ed9d02c63118f673719fdf3e57492aa5aa53f2b7.zip
Merge branch 'develop' into release/5.0.0-beta.19
Diffstat (limited to 'src')
-rw-r--r--src/features/delayApp/index.js2
-rw-r--r--src/features/serviceProxy/index.js4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/features/delayApp/index.js b/src/features/delayApp/index.js
index 92d2dcf6a..9ffa1d2fd 100644
--- a/src/features/delayApp/index.js
+++ b/src/features/delayApp/index.js
@@ -44,7 +44,7 @@ export default function init(stores) {
44 shownAfterLaunch = true; 44 shownAfterLaunch = true;
45 return; 45 return;
46 } 46 }
47 47
48 const diff = moment().diff(timeLastDelay); 48 const diff = moment().diff(timeLastDelay);
49 if ((stores.app.isFocused && diff >= config.delayOffset) || !shownAfterLaunch) { 49 if ((stores.app.isFocused && diff >= config.delayOffset) || !shownAfterLaunch) {
50 debug(`App will be delayed for ${config.delayDuration / 1000}s`); 50 debug(`App will be delayed for ${config.delayDuration / 1000}s`);
diff --git a/src/features/serviceProxy/index.js b/src/features/serviceProxy/index.js
index 5a74685a4..cad9844fd 100644
--- a/src/features/serviceProxy/index.js
+++ b/src/features/serviceProxy/index.js
@@ -1,4 +1,4 @@
1import { autorun, reaction, observable } from 'mobx'; 1import { autorun, observable } from 'mobx';
2import { remote } from 'electron'; 2import { remote } from 'electron';
3 3
4import { DEFAULT_FEATURES_CONFIG } from '../../config'; 4import { DEFAULT_FEATURES_CONFIG } from '../../config';
@@ -30,7 +30,7 @@ export default function init(stores) {
30 30
31 if (config.isEnabled && (isPremiumUser || !config.isPremium)) { 31 if (config.isEnabled && (isPremiumUser || !config.isPremium)) {
32 const serviceProxyConfig = stores.settings.proxy[service.id]; 32 const serviceProxyConfig = stores.settings.proxy[service.id];
33 33
34 if (serviceProxyConfig && serviceProxyConfig.isEnabled && serviceProxyConfig.host) { 34 if (serviceProxyConfig && serviceProxyConfig.isEnabled && serviceProxyConfig.host) {
35 proxyHost = serviceProxyConfig.host; 35 proxyHost = serviceProxyConfig.host;
36 } 36 }