Fixes setting the admin channel not adding to ChatChannels (#51)

tgstation · Jun 19, 2017 · cb7722a · cb7722a
1 parent 33219b1
commit cb7722a
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/TGServerService/Chat.cs b/TGServerService/Chat.cs
@@ -353,10 +353,14 @@ public void SetChannels(string[] channels = null, string adminchannel = null)
 				}
 				adminchannel = SanitizeChannelName(adminchannel);
 				if (adminchannel != null)
+				{
 					Config.ChatAdminChannel = adminchannel;
+					if (!Config.ChatChannels.Contains(adminchannel))
+						Config.ChatChannels.Add(adminchannel);
+				}
 				if (channels != null && Connected())
-					ChatProvider.SetChannels(CollectionToArray(Config.ChatChannels), null);
-			}
+					ChatProvider.SetChannels(CollectionToArray(Config.ChatChannels), Config.ChatAdminChannel);
+			}			
 		}
 
 		//public api