Fix pipeline

Wolkenhof · Sep 5, 2022 · 6bdbae6 · 6bdbae6
1 parent 11da299
commit 6bdbae6
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/Service/ZeroKeyServiceCore/ServiceCore.cs b/Service/ZeroKeyServiceCore/ServiceCore.cs
@@ -632,6 +632,7 @@ private void Disconnected(object sender, SuperSimpleTcp.ConnectionEventArgs e)
 
         private void DataReceived(object sender, SuperSimpleTcp.DataReceivedEventArgs e)
         {
+            if (e.Data.Array == null) return;
             string message = Encoding.UTF8.GetString(e.Data.Array, 0, e.Data.Count);
 
             Debug.WriteLine("Got response from server... sync file now...");

diff --git a/Setup/Scripts/Server.iss b/Setup/Scripts/Server.iss
@@ -42,17 +42,12 @@ Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{
 ; exe file
 Source: "..\..\bin\Release\ServerUI\ZeroKey.ServerUI.exe"; DestDir: {app}; Flags: ignoreversion; \
     BeforeInstall: TaskKill('ZeroKey.ServerUI.exe')
-Source: "..\..\bin\Release\ServerUI\ZeroKey.Server.Main.exe"; DestDir: {app}; Flags: ignoreversion; \
-    BeforeInstall: TaskKill('ZeroKey.Server.Main.exe')
 
 ; Application files
 Source: "..\..\bin\Release\ServerUI\Newtonsoft.Json.dll"; DestDir: {app}; Flags: ignoreversion
 Source: "server.pfx"; DestDir: {app}; Flags: ignoreversion
 Source: "..\..\bin\Release\ServerUI\System.ServiceProcess.ServiceController.dll"; DestDir: {app}; Flags: ignoreversion
 Source: "..\..\bin\Release\ServerUI\Wpf.Ui.dll"; DestDir: {app}; Flags: ignoreversion
-Source: "..\..\bin\Release\ServerUI\ZeroKey.Server.Main.deps.json"; DestDir: {app}; Flags: ignoreversion
-Source: "..\..\bin\Release\ServerUI\ZeroKey.Server.Main.dll"; DestDir: {app}; Flags: ignoreversion
-Source: "..\..\bin\Release\ServerUI\ZeroKey.Server.Main.runtimeconfig.json"; DestDir: {app}; Flags: ignoreversion
 Source: "..\..\bin\Release\ServerUI\ZeroKey.ServerUI.deps.json"; DestDir: {app}; Flags: ignoreversion
 Source: "..\..\bin\Release\ServerUI\ZeroKey.ServerUI.dll"; DestDir: {app}; Flags: ignoreversion
 Source: "..\..\bin\Release\ServerUI\ZeroKey.ServerUI.runtimeconfig.json"; DestDir: {app}; Flags: ignoreversion