fix(desktop): instantiate home server only upon starting

standardnotes · Jul 4, 2023 · 3d3c7f7 · 3d3c7f7
1 parent 3df8be4
commit 3d3c7f7
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/packages/desktop/app/javascripts/Main/HomeServer/HomeServerManager.ts b/packages/desktop/app/javascripts/Main/HomeServer/HomeServerManager.ts
@@ -26,9 +26,7 @@ export class HomeServerManager implements HomeServerManagerInterface {
 
   private homeServer?: HomeServerInterface
 
-  constructor(private webContents: WebContents, private filesManager: FilesManagerInterface) {
-    this.doNotInstantiateHomeServerOnWindowsUntilItIsSupported()
-  }
+  constructor(private webContents: WebContents, private filesManager: FilesManagerInterface) {}
 
   async getHomeServerUrl(): Promise<string | undefined> {
     const homeServerConfiguration = await this.getHomeServerConfigurationObject()
@@ -129,6 +127,8 @@ export class HomeServerManager implements HomeServerManagerInterface {
   }
 
   async startHomeServer(): Promise<string | undefined> {
+    this.doNotInstantiateHomeServerOnWindowsUntilItIsSupported()
+
     if (!this.homeServer) {
       return
     }
@@ -266,7 +266,7 @@ export class HomeServerManager implements HomeServerManagerInterface {
   }
 
   private doNotInstantiateHomeServerOnWindowsUntilItIsSupported(): void {
-    if (!isWindows()) {
+    if (!isWindows() && !this.homeServer) {
       this.homeServer = new HomeServer()
     }
   }