summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAndrej Mihajlov <and@mullvad.net>2019-08-23 16:12:20 +0200
committerAndrej Mihajlov <and@mullvad.net>2019-08-23 16:12:20 +0200
commit0786bb3b44c22a9712afa39a13cbd83ba521f8ff (patch)
tree2fa5f8cfc4100c4ec652dc7bb3ca177ebc344a10
parentd0291326facf5d4e693e03e6496c37de4421fe97 (diff)
parent19efa7d1522e4f6448a739dfb01edcd56197cf8a (diff)
downloadmullvadvpn-0786bb3b44c22a9712afa39a13cbd83ba521f8ff.tar.xz
mullvadvpn-0786bb3b44c22a9712afa39a13cbd83ba521f8ff.zip
Merge branch 'fix-daemon-connected-called-twice'
-rw-r--r--gui/src/renderer/app.tsx6
1 files changed, 6 insertions, 0 deletions
diff --git a/gui/src/renderer/app.tsx b/gui/src/renderer/app.tsx
index a1f5560ce5..094b4f376d 100644
--- a/gui/src/renderer/app.tsx
+++ b/gui/src/renderer/app.tsx
@@ -358,6 +358,12 @@ export default class AppRenderer {
}
private async onDaemonConnected() {
+ // Filter out the calls coming from IPC events arriving right after the constructor finished
+ // execution.
+ if (this.connectedToDaemon) {
+ return;
+ }
+
this.connectedToDaemon = true;
if (this.settings.accountToken) {