diff options
author | Stefan Malzner <stefan@adlk.io> | 2017-10-23 16:46:38 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-23 16:46:38 +0200 |
commit | f1606a0e6503ed55b53b88b42a870144b15a600f (patch) | |
tree | a2543693e8cb99523dc40cfc08966d317a77f141 | |
parent | fix(App): Force Franz to use single window (diff) | |
parent | disable auto-enable for auto start on macOS (diff) | |
download | ferdium-app-f1606a0e6503ed55b53b88b42a870144b15a600f.tar.gz ferdium-app-f1606a0e6503ed55b53b88b42a870144b15a600f.tar.zst ferdium-app-f1606a0e6503ed55b53b88b42a870144b15a600f.zip |
Merge branch 'develop' into feature/single-instance-window
-rw-r--r-- | src/stores/AppStore.js | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js index 42ec25204..254e647f1 100644 --- a/src/stores/AppStore.js +++ b/src/stores/AppStore.js | |||
@@ -303,6 +303,12 @@ export default class AppStore extends Store { | |||
303 | // we need to wait until the settings request is resolved | 303 | // we need to wait until the settings request is resolved |
304 | await this.stores.settings.allSettingsRequest; | 304 | await this.stores.settings.allSettingsRequest; |
305 | 305 | ||
306 | // We don't set autostart on first launch for macOS as disabling | ||
307 | // the option is currently broken | ||
308 | // https://github.com/meetfranz/franz/issues/17 | ||
309 | // https://github.com/electron/electron/issues/10880 | ||
310 | if (process.platform === 'darwin') return; | ||
311 | |||
306 | if (!this.stores.settings.all.appStarts) { | 312 | if (!this.stores.settings.all.appStarts) { |
307 | this.actions.app.launchOnStartup({ | 313 | this.actions.app.launchOnStartup({ |
308 | enable: true, | 314 | enable: true, |