Fix path canonicalization for 64-bit variants

riverar · riverar · commit 7f35ff9b6fc2 · 2025-08-24T23:09:27.000-07:00
diff --git a/EarTrumpet/UI/Controls/ImageEx.cs b/EarTrumpet/UI/Controls/ImageEx.cs
@@ -157,7 +157,7 @@ public static ImageSource LoadShellIcon(string path, bool isDesktopApp, int cx,
 
     private static string CanonicalizePath(string path)
     {
-        if (Path.GetDirectoryName(path).StartsWith(_systemPath, StringComparison.InvariantCultureIgnoreCase))
+        if (!Environment.Is64BitProcess && Path.GetDirectoryName(path).StartsWith(_systemPath, StringComparison.InvariantCultureIgnoreCase))
         {
             path = Path.Combine(_windowsPath, "sysnative", path[(_systemPath.Length + 1)..]);
         }

Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,7 @@ public static ImageSource LoadShellIcon(string path, bool isDesktopApp, int cx,`
`157`	`157`
`158`	`158`	`private static string CanonicalizePath(string path)`
`159`	`159`	`{`
`160`		`- if (Path.GetDirectoryName(path).StartsWith(_systemPath, StringComparison.InvariantCultureIgnoreCase))`
	`160`	`+ if (!Environment.Is64BitProcess && Path.GetDirectoryName(path).StartsWith(_systemPath, StringComparison.InvariantCultureIgnoreCase))`
`161`	`161`	`{`
`162`	`162`	`path = Path.Combine(_windowsPath, "sysnative", path[(_systemPath.Length + 1)..]);`
`163`	`163`	`}`