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

[MM-36030] Allow for duplicate servers with different names to behave normally (#1628)

Browse Source
This commit is contained in:
Devin Binnie
2021-06-10 11:33:52 -04:00
committed by GitHub
parent 3aaf1797aa
commit 46ffece3ed
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/config/index.js
View File

@@ -336,7 +336,7 @@ export default class Config extends EventEmitter {
let newTeams = teams;
const uniqueURLs = new Set();
newTeams = newTeams.filter((team) => {
return uniqueURLs.has(team.url) ? false : uniqueURLs.add(team.url);
return uniqueURLs.has(`${team.name}:${team.url}`) ? false : uniqueURLs.add(`${team.name}:${team.url}`);
});
return newTeams;
}

2
src/main/views/viewManager.js
View File

@@ -72,7 +72,7 @@ export class ViewManager {
if (recycle && recycle.isVisible) {
setFocus = recycle.name;
}
if (recycle && recycle.server.url.toString() === urlUtils.parseURL(server.url).toString()) {
if (recycle && recycle.server.name === server.name && recycle.server.url.toString() === urlUtils.parseURL(server.url).toString()) {
oldviews.delete(recycle.name);
this.views.set(recycle.name, recycle);
} else {