paulmataruso/zulip-desktop
1
0
Fork 0
mirror of https://github.com/zulip/zulip-desktop.git synced 2025-11-10 00:45:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #189 from geeeeeeeeek/issue/close-settings-bug

Browse Source 
Fix close settings causing split webviews (#188).
This commit is contained in:
Akash Nimare
2017-06-28 08:48:06 -07:00
committed by GitHub
parent a16181be33 1e60643ae9
commit cda8aa3b09
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/renderer/js/main.js
View File

@@ -70,7 +70,7 @@ class ServerManagerView {
} }
openFunctionalTab(tabProps) { openFunctionalTab(tabProps) {
if (this.functionalTabs[tabProps.name]) { if (this.functionalTabs[tabProps.name] !== undefined) {
this.activateTab(this.functionalTabs[tabProps.name]); this.activateTab(this.functionalTabs[tabProps.name]);
return; return;
} }
@@ -150,8 +150,11 @@ class ServerManagerView {
delete this.tabs[index]; delete this.tabs[index];
delete this.functionalTabs[name]; delete this.functionalTabs[name];
// Issue #188: If the functional tab was not focused, do not activate another tab.
if (this.activeTabIndex === index) {
this.activateTab(0, false); this.activateTab(0, false);
} }
}
updateBadge() { updateBadge() {
let messageCountAll = 0; let messageCountAll = 0;