Updated to pass in the VelopackAsset to ApplyUpdatesAndRestart.

RandomEngy · May 19, 2024 · 828906c · 828906c
1 parent f925cf8
commit 828906c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/VidCoder/Services/Interfaces/IUpdater.cs b/VidCoder/Services/Interfaces/IUpdater.cs
@@ -6,6 +6,7 @@
 namespace VidCoder.Services;
 
 using Model;
+using Velopack;
 
 public interface IUpdater
 {
@@ -15,5 +16,7 @@ public interface IUpdater
 
 	UpdateState State { get; }
 	Version LatestVersion { get; }
+	VelopackAsset LatestAsset { get; }
+
 	int UpdateDownloadProgressPercent { get; set; }
 }
diff --git a/VidCoder/Services/Updater.cs b/VidCoder/Services/Updater.cs
@@ -27,6 +27,8 @@ public int UpdateDownloadProgressPercent
 
 	public Version LatestVersion { get; set; }
 
+	public VelopackAsset LatestAsset { get; set; }
+
 	public bool PromptToApplyUpdate()
 	{
 		if (Utilities.SupportsUpdates)
@@ -42,7 +44,7 @@ public bool PromptToApplyUpdate()
 				if (updateConfirmation.Accepted)
 				{
 					var updateManager = new UpdateManager(Utilities.VelopackUpdateUrl);
-					updateManager.ApplyUpdatesAndRestart(null, null);
+					updateManager.ApplyUpdatesAndRestart(this.LatestAsset);
 
 					return true;
 				}
@@ -101,6 +103,7 @@ private async void StartBackgroundUpdate(bool isManualCheck)
 			{
 				// Save latest version (just major and minor)
 				this.LatestVersion = new Version(updateInfo.TargetFullRelease.Version.Major, updateInfo.TargetFullRelease.Version.Minor);
+				this.LatestAsset = updateInfo.TargetFullRelease;
 
 				this.State = UpdateState.Downloading;
 				await updateManager.DownloadUpdatesAsync(updateInfo, (progressPercent) =>

diff --git a/VidCoder/ViewModel/OptionsDialogViewModel.cs b/VidCoder/ViewModel/OptionsDialogViewModel.cs
@@ -993,7 +993,7 @@ public ICommand ApplyUpdate
 				() =>
 				{
 					var updateManager = new UpdateManager(Utilities.VelopackUpdateUrl);
-					updateManager.ApplyUpdatesAndRestart(null, null);
+					updateManager.ApplyUpdatesAndRestart(this.Updater.LatestAsset);
 				}));
 		}
 	}