aaron/mattermost-desktop
1
0
Fork 0
Code Issues Pull requests Actions 1 Packages Projects Releases Wiki Activity

Fix two server manager issues (#2727)

Browse source
This commit is contained in:
Devin Binnie 2023-05-20 11:39:32 -04:00 committed by GitHub
parent 2ed851c2a4
commit a87e770c73
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/common/servers/serverManager.ts
View file

@ -238,6 +238,10 @@ export class ServerManager extends EventEmitter {
this.currentServerId = this.serverOrder[0]; this.currentServerId = this.serverOrder[0];
} }
if (!this.hasServers()) {
delete this.currentServerId;
}
this.persistServers(); this.persistServers();
} }

4
src/main/app/intercom.ts
View file

@ -38,6 +38,10 @@ function handleShowOnboardingScreens(showWelcomeScreen: boolean, showNewServerMo
log.debug('handleShowOnboardingScreens', {showWelcomeScreen, showNewServerModal, mainWindowIsVisible}); log.debug('handleShowOnboardingScreens', {showWelcomeScreen, showNewServerModal, mainWindowIsVisible});
if (showWelcomeScreen) { if (showWelcomeScreen) {
if (ModalManager.isModalDisplayed()) {
return;
}
handleWelcomeScreenModal(); handleWelcomeScreenModal();
if (process.env.NODE_ENV === 'test') { if (process.env.NODE_ENV === 'test') {