From dffeb393370a462bfe9c69e307a2e79a68b10593 Mon Sep 17 00:00:00 2001 From: shinichi Date: Fri, 9 Oct 2020 11:40:52 +0200 Subject: [PATCH] mainView is now binded --- ClientApp/ViewModels/MainViewModel.cs | 2 +- ClientApp/Views/MainView.xaml | 2 +- Server/Communication.cs | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ClientApp/ViewModels/MainViewModel.cs b/ClientApp/ViewModels/MainViewModel.cs index 872b33a..ee13d90 100644 --- a/ClientApp/ViewModels/MainViewModel.cs +++ b/ClientApp/ViewModels/MainViewModel.cs @@ -9,7 +9,7 @@ namespace ClientApp.ViewModels { public ICommand RetryServerCommand { get; set; } public ICommand RetryVREngineCommand { get; set; } - public MainWindowViewModel MainWindowViewModel; + public MainWindowViewModel MainWindowViewModel { get; set; } public MainViewModel(MainWindowViewModel mainWindowViewModel) diff --git a/ClientApp/Views/MainView.xaml b/ClientApp/Views/MainView.xaml index 14d43b4..72a0ff2 100644 --- a/ClientApp/Views/MainView.xaml +++ b/ClientApp/Views/MainView.xaml @@ -21,7 +21,7 @@ diff --git a/Server/Communication.cs b/Server/Communication.cs index f3432c8..47bdb68 100644 --- a/Server/Communication.cs +++ b/Server/Communication.cs @@ -1,4 +1,4 @@ -using Client; +using ClientApp.Utils; using System; using System.Collections.Generic; using System.IO.Pipes; @@ -31,7 +31,7 @@ namespace Server private void OnConnect(IAsyncResult ar) { - + var tcpClient = listener.EndAcceptTcpClient(ar); Console.WriteLine($"Client connected from {tcpClient.Client.RemoteEndPoint}"); clients.Add(new Client(this, tcpClient));