summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--app/lib/backend-routing.js9
1 files changed, 7 insertions, 2 deletions
diff --git a/app/lib/backend-routing.js b/app/lib/backend-routing.js
index 7ff114f709..0ea354a594 100644
--- a/app/lib/backend-routing.js
+++ b/app/lib/backend-routing.js
@@ -8,8 +8,13 @@ export default function mapBackendEventsToRouter(backend, store) {
setTimeout(() => {
const { settings } = store.getState();
- const server = backend.serverInfo(settings.preferredServer);
- backend.connect(server.address);
+
+ // auto-connect only if autoSecure is on
+ if(settings.autoSecure) {
+ const server = backend.serverInfo(settings.preferredServer);
+ backend.connect(server.address);
+ }
+
store.dispatch(replace('/connect'));
}, 1000);
});