Merge pull request #609 from raelgc/608-fix-multiple-team-loading

Fixing multiteam loading (#608)
raelgc · Jan 16, 2018 · b107aad · b107aad
2 parents 3d68913 + dd56e81
commit b107aad
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/scudcloud/resources/scudcloud.js b/scudcloud/resources/scudcloud.js
@@ -102,9 +102,8 @@ ScudCloud = {
 		return TS.ui.snippet_dialog.start();
 	},
 	listChannels: function(){
-		var channels = TS.channels.getUnarchivedChannelsForUser();
-		channels.push(TS.channels.getChannelById(TS.model.active_channel_id));
-		return channels;
+		// Slack is now including current channel in the unarchived list (Fixes #608)
+		return TS.channels.getUnarchivedChannelsForUser();
 	},
 	listTeams: function(){
 		var currentTeam = {

diff --git a/scudcloud/scudcloud.py b/scudcloud/scudcloud.py
@@ -416,13 +416,12 @@ def closeEvent(self, event):
         if not self.forceClose and self.settings.value("Systray") == "True":
             self.hide()
             event.ignore()
-        else:
+        elif self.forceClose:
             self.cookiesjar.save()
             self.settings.setValue("Domain", self.domains)
             self.settings.setValue("geometry", self.saveGeometry())
             self.settings.setValue("windowState", self.saveState())
             self.settings.setValue("Domain", self.domains)
-        self.forceClose = False
 
     def show(self):
         self.setWindowState(self.windowState() & ~QtCore.Qt.WindowMinimized | QtCore.Qt.WindowActive)