Merge branch 'develop' into feature/single-instance-window

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 {
       // we need to wait until the settings request is resolved
       await this.stores.settings.allSettingsRequest;
 
+      // We don't set autostart on first launch for macOS as disabling
+      // the option is currently broken
+      // https://github.com/meetfranz/franz/issues/17
+      // https://github.com/electron/electron/issues/10880
+      if (process.platform === 'darwin') return;
+
       if (!this.stores.settings.all.appStarts) {
         this.actions.app.launchOnStartup({
           enable: true,