From a2dc42a9a420028644c1075a62047126f4a46397 Mon Sep 17 00:00:00 2001 From: Pilzinsel64 Date: Fri, 30 Aug 2024 10:55:55 +0200 Subject: [PATCH] fail if hostapppath is null --- Pilz.Updating.Client/UpdateClient.cs | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/Pilz.Updating.Client/UpdateClient.cs b/Pilz.Updating.Client/UpdateClient.cs index 8f3c066..097b78e 100644 --- a/Pilz.Updating.Client/UpdateClient.cs +++ b/Pilz.Updating.Client/UpdateClient.cs @@ -20,10 +20,10 @@ public class UpdateClient(string updateUrl, AppVersion currentVersion, Channels public Channels MinimumChannel { get; private set; } = (Channels)Math.Max((int)minimumChannel, (int)currentVersion.Channel); public UpdateInfo? UpdateInfo { get; private set; } public UpdatePackageInfo? UpdatePackageInfo { get; private set; } - public string HostApplicationPath { get; set; } = string.Empty; - public string ApplicationName { get; set; } = string.Empty; - public bool InstallAsAdmin { get; set; } = false; - public bool UIDarkMode { get; set; } = false; + public string? HostApplicationPath { get; set; } + public string? ApplicationName { get; set; } + public bool InstallAsAdmin { get; set; } + public bool UIDarkMode { get; set; } public bool HasUpdates => UpdatePackageInfo != null; // E v e n t M e t h o d s @@ -150,17 +150,18 @@ public class UpdateClient(string updateUrl, AppVersion currentVersion, Channels public void InstallPackage(UpdatePackageInfo package) { + if (string.IsNullOrWhiteSpace(HostApplicationPath) || !dicPackagePaths.TryGetValue(package, out var packagePath)) + { + RaiseStatusChanged(UpdateStatus.Failed); + return; + } + // Extract Package if (!RaiseStatusChanged(UpdateStatus.Extracting, UpdateStatusEvent.PreEvent, true)) { RaiseStatusChanged(UpdateStatus.Canceled); return; } - if (!dicPackagePaths.TryGetValue(package, out var packagePath)) - { - RaiseStatusChanged(UpdateStatus.Failed); - return; - } string dataPath; if (package.Type == PackageType.Zip) {