diff options
author | 2018-12-02 00:56:19 +0100 | |
---|---|---|
committer | 2018-12-02 00:56:19 +0100 | |
commit | ed9d02c63118f673719fdf3e57492aa5aa53f2b7 (patch) | |
tree | b895f26252a0c4e54a1a083e17275fab9b32f9a4 | |
parent | Merge branch 'develop' into release/5.0.0-beta.19 (diff) | |
parent | Fix linting issues (diff) | |
download | ferdium-app-ed9d02c63118f673719fdf3e57492aa5aa53f2b7.tar.gz ferdium-app-ed9d02c63118f673719fdf3e57492aa5aa53f2b7.tar.zst ferdium-app-ed9d02c63118f673719fdf3e57492aa5aa53f2b7.zip |
Merge branch 'develop' into release/5.0.0-beta.19
-rw-r--r-- | src/features/delayApp/index.js | 2 | ||||
-rw-r--r-- | src/features/serviceProxy/index.js | 4 |
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 @@ | |||
1 | import { autorun, reaction, observable } from 'mobx'; | 1 | import { autorun, observable } from 'mobx'; |
2 | import { remote } from 'electron'; | 2 | import { remote } from 'electron'; |
3 | 3 | ||
4 | import { DEFAULT_FEATURES_CONFIG } from '../../config'; | 4 | import { 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 | } |