phlux/mattermostest
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[MM-38532] Force new server to display when added (#1737)

Browse Source
This commit is contained in:
Devin Binnie
2021-09-20 13:56:12 -04:00
committed by GitHub
parent ac0de01d4b
commit c3963424f1
4 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/windows/windowManager.ts
View File

@@ -357,7 +357,7 @@ function initializeViewManager() {
}
}
export function switchServer(serverName: string) {
export function switchServer(serverName: string, waitForViewToExist = false) {
showMainWindow();
const server = status.config?.teams.find((team) => team.name === serverName);
if (!server) {
@@ -371,7 +371,16 @@ export function switchServer(serverName: string) {
nextTab = openTabs.find((e) => e.order === 0) || openTabs[0];
}
const tabViewName = getTabViewName(serverName, nextTab.name);
status.viewManager?.showByName(tabViewName);
if (waitForViewToExist) {
const timeout = setInterval(() => {
if (status.viewManager?.views.has(tabViewName)) {
status.viewManager?.showByName(tabViewName);
clearTimeout(timeout);
}
}, 100);
} else {
status.viewManager?.showByName(tabViewName);
}
ipcMain.emit(UPDATE_SHORTCUT_MENU);
}