Merge remote-tracking branch 'origin/setupBranch' into setupBranch

2020-10-20 16:38:59 +02:00
parent 84bf1b3e64 e90d782887
commit 1a539efdd1
8 changed files with 62 additions and 21 deletions
--- a/Client/Views/MainWindow.xaml.cs
+++ b/Client/Views/MainWindow.xaml.cs
@@ -37,7 +37,6 @@ namespace Client
            if(lobbySelected != null)
            {
                testLabel.Content = lobbySelected.ID;
-                usernameTextbox.IsEnabled = false;
                colorSelection.IsEnabled = false;
                joinButton.IsEnabled = false;
                hostButton.IsEnabled = false;