From a87e770c73291b81729dddaf4136cd1e0a7a9fa8 Mon Sep 17 00:00:00 2001
From: Devin Binnie <52460000+devinbinnie@users.noreply.github.com>
Date: Sat, 20 May 2023 11:39:32 -0400
Subject: [PATCH] Fix two server manager issues (#2727)

---
 src/common/servers/serverManager.ts | 4 ++++
 src/main/app/intercom.ts            | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/src/common/servers/serverManager.ts b/src/common/servers/serverManager.ts
index ae323372..b36445a4 100644
--- a/src/common/servers/serverManager.ts
+++ b/src/common/servers/serverManager.ts
@@ -238,6 +238,10 @@ export class ServerManager extends EventEmitter {
             this.currentServerId = this.serverOrder[0];
         }
 
+        if (!this.hasServers()) {
+            delete this.currentServerId;
+        }
+
         this.persistServers();
     }
 
diff --git a/src/main/app/intercom.ts b/src/main/app/intercom.ts
index 5b947759..e35263e8 100644
--- a/src/main/app/intercom.ts
+++ b/src/main/app/intercom.ts
@@ -38,6 +38,10 @@ function handleShowOnboardingScreens(showWelcomeScreen: boolean, showNewServerMo
     log.debug('handleShowOnboardingScreens', {showWelcomeScreen, showNewServerModal, mainWindowIsVisible});
 
     if (showWelcomeScreen) {
+        if (ModalManager.isModalDisplayed()) {
+            return;
+        }
+
         handleWelcomeScreenModal();
 
         if (process.env.NODE_ENV === 'test') {