Change how auto connect is set

Change it in the GUI specific settings and check if it should also be
set in the daemon.

1 files changed, 8 insertions, 1 deletions

diff --git a/gui/packages/desktop/src/renderer/app.js b/gui/packages/desktop/src/renderer/app.js
index 793b0a9224..84a7a4951c 100644
--- a/gui/packages/desktop/src/renderer/app.js
+++ b/gui/packages/desktop/src/renderer/app.js
@@ -14,6 +14,7 @@ import { createMemoryHistory } from 'history';
 
 import { InvalidAccountError } from '../main/errors';
 import makeRoutes from './routes';
+import { getOpenAtLogin } from './lib/autostart';
 
 import configureStore from './redux/store';
 import accountActions from './redux/account/actions';
@@ -343,10 +344,16 @@ export default class AppRenderer {
 
   async setAutoConnect(autoConnect: boolean) {
     const actions = this._reduxActions;
-    await this._daemonRpc.setAutoConnect(autoConnect);
+    await IpcRendererEventChannel.guiSettings.setAutoConnect(autoConnect);
+    await this._setDaemonAutoConnect(autoConnect, getOpenAtLogin());
     actions.settings.updateAutoConnect(autoConnect);
   }
 
+  async _setDaemonAutoConnect(guiAutoConnect: boolean, autoStart: boolean) {
+    const daemonAutoConnect = guiAutoConnect && autoStart;
+    await this._daemonRpc.setAutoConnect(daemonAutoConnect);
+  }
+
   setStartMinimized(startMinimized: boolean) {
     IpcRendererEventChannel.guiSettings.setStartMinimized(startMinimized);
   }