From ea321179bc85f2806ba5baae2cbdb9e05d47ec9e Mon Sep 17 00:00:00 2001
From: Jeremy Tellier - ROG <JeremyTellier@gmail.com>
Date: Fri, 8 May 2020 20:49:10 +0100
Subject: [PATCH] Um maybe latest but this looks unfamiliar for clint

---
 ZitiTunneler/MainWindow.xaml.cs  | 22 ++++++----------------
 ZitiTunneler/ZitiTunneler.csproj | 10 +++++-----
 2 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/ZitiTunneler/MainWindow.xaml.cs b/ZitiTunneler/MainWindow.xaml.cs
index 6fec2c9f..c9183891 100644
--- a/ZitiTunneler/MainWindow.xaml.cs
+++ b/ZitiTunneler/MainWindow.xaml.cs
@@ -44,6 +44,7 @@ namespace ZitiTunneler {
 			notifyIcon.Visible = true;
 			notifyIcon.ShowBalloonTip(5000, "Test", "Testing", System.Windows.Forms.ToolTipIcon.Info);
 
+			
 			ServiceController ctl = ServiceController.GetServices().FirstOrDefault(s => s.ServiceName=="ziti");
 			if (ctl==null) {
 				ProcessStartInfo installService = new ProcessStartInfo();
@@ -77,6 +78,7 @@ namespace ZitiTunneler {
 					}
 				}
 			}
+			
 
 			SetNotifyIcon("white");
 			InitializeComponent();
@@ -132,22 +134,11 @@ namespace ZitiTunneler {
 			IdentityMenu.OnForgot += IdentityForgotten;
 		}
 
-<<<<<<< HEAD
 		private void ServiceClient_OnMetricsUpdate(object sender, Metrics e) {
-			this.Dispatcher.Invoke(() => {
-				DownloadSpeed.Content = (e.Down / 1000).ToString();
-				UploadSpeed.Content = (e.Up / 1000).ToString();
-			});
-		}
-		private void ServiceClient_OnTunnelStatusUpdated(object sender, TunnelStatus e) {
-=======
-		private void ServiceClient_OnMetricsUpdate(object sender, Metrics e)
-		{
-			if (e != null) {
-				this.Dispatcher.Invoke(() =>
-				{
-					DownloadSpeed.Content = (e.Down / 1000).ToString();
-					UploadSpeed.Content = (e.Up / 1000).ToString();
+			if (e!=null) {
+				this.Dispatcher.Invoke(() => {
+					DownloadSpeed.Content=(e.Down/1000).ToString();
+					UploadSpeed.Content=(e.Up/1000).ToString();
 				});
 			}
 		}
@@ -174,7 +165,6 @@ namespace ZitiTunneler {
 					UploadSpeed.Content = (totalUp / 1000).ToString();
 				});
 			}
->>>>>>> origin/bug-fixing
 		}
 
 		private void IdentityForgotten(ZitiIdentity forgotten) {
diff --git a/ZitiTunneler/ZitiTunneler.csproj b/ZitiTunneler/ZitiTunneler.csproj
index 37759572..eb2ffb1b 100644
--- a/ZitiTunneler/ZitiTunneler.csproj
+++ b/ZitiTunneler/ZitiTunneler.csproj
@@ -265,19 +265,19 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="Service\libgcc_s_seh-1.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="Service\libuv.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="Service\libwinpthread-1.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="Service\ziti-tunnel.exe">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="Service\ziti.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />