Mirrors/velopack
1
0
Fork 0
mirror of https://github.com/velopack/velopack.git synced 2025-10-25 15:19:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix bug in legacy shortcut codes for None enum value

Browse Source
This commit is contained in:
Caelan Sayler
2024-05-24 17:27:42 +01:00
parent 285a435dc7
commit a486e3a254
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/Velopack/Windows/Shortcuts.cs
View File

@@ -114,8 +114,7 @@ namespace Velopack.Windows
var fileVerInfo = FileVersionInfo.GetVersionInfo(exePath);
foreach (var f in (ShortcutLocation[]) Enum.GetValues(typeof(ShortcutLocation))) {
if (!locations.HasFlag(f)) continue;
foreach (var f in GetLocations(locations)) {
var file = LinkPathForVersionInfo(f, zf, fileVerInfo, rootAppDirectory);
if (File.Exists(file)) {
Log.Info($"Opening existing shortcut for {relativeExeName} ({file})");
@@ -150,9 +149,7 @@ namespace Velopack.Windows
var fileVerInfo = FileVersionInfo.GetVersionInfo(exePath);
foreach (var f in (ShortcutLocation[]) Enum.GetValues(typeof(ShortcutLocation))) {
if (!locations.HasFlag(f)) continue;
foreach (var f in GetLocations(locations)) {
var file = LinkPathForVersionInfo(f, zf, fileVerInfo, rootAppDirectory);
var fileExists = File.Exists(file);
@@ -215,8 +212,7 @@ namespace Velopack.Windows
var fileVerInfo = FileVersionInfo.GetVersionInfo(exePath);
foreach (var f in (ShortcutLocation[]) Enum.GetValues(typeof(ShortcutLocation))) {
if (!locations.HasFlag(f)) continue;
foreach (var f in GetLocations(locations)) {
var file = LinkPathForVersionInfo(f, zf, fileVerInfo, rootAppDirectory);
Log.Info($"Removing shortcut for {relativeExeName} => {file}");
try {
@@ -281,5 +277,14 @@ namespace Velopack.Windows
return Path.Combine(dir, title + ".lnk");
}
private ShortcutLocation[] GetLocations(ShortcutLocation flag)
{
var locations = (ShortcutLocation[]) Enum.GetValues(typeof(ShortcutLocation));
return locations
.Where(x => x != ShortcutLocation.None)
.Where(x => flag.HasFlag(x))
.ToArray();
}
}
}