Merge branch 'start-with-correct-menubar-icon-2'

2 files changed, 33 insertions, 6 deletions

diff --git a/gui/src/main/expectation.ts b/gui/src/main/expectation.ts
new file mode 100644
index 0000000000..18fafb2836
--- /dev/null
+++ b/gui/src/main/expectation.ts
@@ -0,0 +1,20 @@
+export default class Expectation {
+  private fulfilled = false;
+  private timeout: NodeJS.Timeout;
+
+  constructor(private handler: () => void, timeout = 2000) {
+    this.timeout = global.setTimeout(() => {
+      this.fulfill();
+    }, timeout);
+  }
+
+  public fulfill() {
+    if (this.fulfilled) {
+      return;
+    }
+
+    this.fulfilled = true;
+    global.clearTimeout(this.timeout);
+    this.handler();
+  }
+}
diff --git a/gui/src/main/index.ts b/gui/src/main/index.ts
index 0f1082e0fa..417a6648cb 100644
--- a/gui/src/main/index.ts
+++ b/gui/src/main/index.ts
@@ -44,6 +44,7 @@ import {
   SubscriptionListener,
 } from './daemon-rpc';
 import { InvalidAccountError } from './errors';
+import Expectation from './expectation';
 import GuiSettings from './gui-settings';
 import NotificationController from './notification-controller';
 import { resolveBin } from './proc';
@@ -127,6 +128,7 @@ class ApplicationMain {
   private guiSettings = new GuiSettings();
   private location?: ILocation;
   private lastDisconnectedLocation?: ILocation;
+  private tunnelStateExpectation?: Expectation;
 
   private relays: IRelayList = { countries: [] };
 
@@ -323,18 +325,19 @@ class ApplicationMain {
     const tray = this.createTray();
 
     const windowController = new WindowController(window, tray);
-    const trayIconController = new TrayIconController(
-      tray,
-      'unsecured',
-      this.guiSettings.monochromaticIcon,
-    );
+    this.tunnelStateExpectation = new Expectation(() => {
+      this.trayIconController = new TrayIconController(
+        tray,
+        this.trayIconType(this.tunnelState, this.settings.blockWhenDisconnected),
+        this.guiSettings.monochromaticIcon,
+      );
+    });
 
     this.registerWindowListener(windowController);
     this.registerIpcListeners();
     this.addContextMenu(window);
 
     this.windowController = windowController;
-    this.trayIconController = trayIconController;
 
     this.guiSettings.onChange = (newState, oldState) => {
       if (oldState.monochromaticIcon !== newState.monochromaticIcon) {
@@ -426,6 +429,10 @@ class ApplicationMain {
       return this.recoverFromBootstrapError(error);
     }
 
+    if (this.tunnelStateExpectation) {
+      this.tunnelStateExpectation.fulfill();
+    }
+
     // fetch relays
     try {
       this.setRelays(