Fix two server manager issues (#2727)
This commit is contained in:
parent
2ed851c2a4
commit
a87e770c73
|
@ -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();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -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') {
|
||||||
|
|
Loading…
Reference in a new issue