From 7ccd65dc68bf9ad801591bcd4520b46e7d54a4a7 Mon Sep 17 00:00:00 2001
From: Ilya <admin@redguy.ru>
Date: Sat, 6 Mar 2021 16:56:56 +0300
Subject: [PATCH] Bug Fixes

---
 MafiaClient/MainWindow.axaml.cs |  2 ++
 MafiaClient/ServerConnection.cs | 11 ++++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/MafiaClient/MainWindow.axaml.cs b/MafiaClient/MainWindow.axaml.cs
index ebc4c89..eb704b1 100644
--- a/MafiaClient/MainWindow.axaml.cs
+++ b/MafiaClient/MainWindow.axaml.cs
@@ -277,10 +277,12 @@ namespace MafiaClient
             this.FindControl<ListBox>("GameDaySelect").IsEnabled = voting;
             if (players.Count != 0)
             {
+                this.FindControl<ListBox>("GameDaySelect").Items = null;
                 List<ListBoxItem> items = new List<ListBoxItem>();
                 foreach (Player player in players)
                 {
                     items.Add(new ListBoxItem {Content = player.Id + ") " + player.Name});
+                    Console.WriteLine(player.Id + ") " + player.Name);
                 }
                 this.FindControl<ListBox>("GameDaySelect").Items = items;
             }
diff --git a/MafiaClient/ServerConnection.cs b/MafiaClient/ServerConnection.cs
index a1d3de0..4bad5e5 100644
--- a/MafiaClient/ServerConnection.cs
+++ b/MafiaClient/ServerConnection.cs
@@ -68,7 +68,7 @@ namespace MafiaClient
                 list.Add(message);
                 listBoxes.Items = list;
             }
-            MainWindow.Instance.FindControl<ScrollViewer>("QueueChatViewer").ScrollToEnd();
+            MainWindow.Instance.FindControl<ScrollViewer>(chatName).ScrollToEnd();
         }
 
         public void SendMessage(ChatType chatType, string text)
@@ -76,6 +76,13 @@ namespace MafiaClient
             _socket.Send(PacketConverter.ToBytes(new MessageSendPacket(chatType, text)));
         }
 
+        public void ClearChats()
+        {
+            MainWindow.Instance.FindControl<ItemsRepeater>("QueueChat").Items = null;
+            MainWindow.Instance.FindControl<ItemsRepeater>("GameVotingActiveChat").Items = null;
+            MainWindow.Instance.FindControl<ItemsRepeater>("GameDayChat").Items = null;
+        }
+
         public void Disconnect()
         {
             _connected = false;
@@ -224,6 +231,7 @@ namespace MafiaClient
                         break;
                     case PacketType.GameStartPacket:
                         List<Player> players = ((GameStartPacket) packet).Players;
+                        ClearChats();
                         switch (((GameStartPacket) packet).Role)
                         {
                             case Role.Citizen:
@@ -299,6 +307,7 @@ namespace MafiaClient
                                             : "Дон";
                                         List<ListBoxItem> items = new List<ListBoxItem>();
                                         MainWindow.Instance.ShowVotingActive("Ты " + rol + ", выбери кого убить!");
+                                        MainWindow.Instance.FindControl<ListBox>("GameVotingActiveSelect").Items = null;
                                         foreach (Player player in players)
                                         {
                                             ListBoxItem item = new ListBoxItem