Develop #10

Merged
SemvdH merged 229 commits from develop into master 2020-10-29 22:50:49 +00:00
3 changed files with 4 additions and 4 deletions
Showing only changes of commit dffeb39337 - Show all commits

View File

@@ -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)

View File

@@ -21,7 +21,7 @@
<StackPanel Grid.Column="0" Grid.Row="0" Orientation="Horizontal" Margin="10">
<Label Content="Connected to server:"/>
<Label Content="{Binding Path=MainWindowViewModel.InfoModel.ConnectedToServer}"/>
<Label Content="true"/>
</StackPanel>
<StackPanel Grid.Column="1" Grid.Row="0" Orientation="Horizontal" Margin="10">

View File

@@ -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));