Properly handle COMException and removed locking status check to avoi…

…d potential dead locks.
soleon · Jan 3, 2025 · 3d6444c · 3d6444c
1 parent 722049f
commit 3d6444c
Show file tree

Hide file tree

Showing 7 changed files with 150 additions and 175 deletions.
diff --git a/App/App.csproj b/App/App.csproj
@@ -16,7 +16,7 @@
         <SupportedOSPlatformVersion>10.0.22000.0</SupportedOSPlatformVersion>
         <ApplicationHighDpiMode>PerMonitorV2</ApplicationHighDpiMode>
         <Platforms>AnyCPU;x64;ARM64;x86</Platforms>
-        <PackageVersion>2.1.6</PackageVersion>
+        <PackageVersion>2.1.7</PackageVersion>
         <PackageProjectUrl>https://github.com/soleon/Percentage</PackageProjectUrl>
         <PackageLicenseUrl>https://github.com/soleon/Percentage?tab=MIT-1-ov-file</PackageLicenseUrl>
         <PackageIcon>Icon.png</PackageIcon>

diff --git a/App/Extensions/ApplicationExtensions.cs b/App/Extensions/ApplicationExtensions.cs
@@ -19,7 +19,7 @@ internal static MainWindow ActivateMainWindow(this Application app)
         return window;
     }
 
-    internal static NotifyIconWindow GetTrayIconWindow(this Application app)
+    internal static NotifyIconWindow GetNotifyIconWindow(this Application app)
     {
         return app.Windows.OfType<NotifyIconWindow>().FirstOrDefault();
     }

diff --git a/App/Extensions/DelegateExtensions.cs b/App/Extensions/DelegateExtensions.cs
@@ -4,7 +4,7 @@ namespace Percentage.App.Extensions;
 
 internal static class DelegateExtensions
 {
-    private const int DefaultMaxRetryCount = 5;
+    private const int DefaultMaxRetryCount = 3;
 
     internal static void RetryOnException<T>(this Action action, Action<T> onRetryFailed = null,
         int maxRetryCount = DefaultMaxRetryCount) where T : Exception

diff --git a/App/Extensions/NotifyIconExtensions.cs b/App/Extensions/NotifyIconExtensions.cs
@@ -39,21 +39,20 @@ internal static void SetIcon(this NotifyIcon notifyIcon, FrameworkElement textBl
 
         // Render the element with the correct DPI scale.
         var dpiScale = VisualTreeHelper.GetDpi(textBlock);
-        var renderTargetBitmap = new RenderTargetBitmap(
-            (int)Math.Round(DefaultNotifyIconSize * dpiScale.DpiScaleX, MidpointRounding.AwayFromZero),
-            (int)Math.Round(DefaultNotifyIconSize * dpiScale.DpiScaleY, MidpointRounding.AwayFromZero),
-            dpiScale.PixelsPerInchX,
-            dpiScale.PixelsPerInchY,
-            PixelFormats.Default);
-
-        // There's a chance that a COMException can be thrown when rendering the bitmap.
-        // Catch any COM exceptions here and retry a few times then fail silently.
-        DelegateExtensions.RetryOnException<COMException>(() => renderTargetBitmap.Render(textBlock),
-            App.SetTrayIconUpdateError);
-
-        // There's a chance that some native exception may be thrown when setting the icon's image.
+
+        // There's a chance that some native exceptions may be thrown when rendering and setting the icon's image.
         // Catch any exception here and retry a few times then fail silently.
-        DelegateExtensions.RetryOnException<Exception>(() => notifyIcon.Icon = renderTargetBitmap,
-            App.SetTrayIconUpdateError);
+        DelegateExtensions.RetryOnException<Exception>(() =>
+        {
+            var renderTargetBitmap = new RenderTargetBitmap(
+                (int)Math.Round(DefaultNotifyIconSize * dpiScale.DpiScaleX, MidpointRounding.AwayFromZero),
+                (int)Math.Round(DefaultNotifyIconSize * dpiScale.DpiScaleY, MidpointRounding.AwayFromZero),
+                dpiScale.PixelsPerInchX,
+                dpiScale.PixelsPerInchY,
+                PixelFormats.Default);
+            renderTargetBitmap.Render(textBlock);
+            notifyIcon.Icon = renderTargetBitmap;
+            App.SetTrayIconUpdateError(null);
+        }, App.SetTrayIconUpdateError);
     }
 }
diff --git a/App/NotifyIconWindow.xaml.cs b/App/NotifyIconWindow.xaml.cs
diff --git a/App/Pages/DetailsPage.xaml.cs b/App/Pages/DetailsPage.xaml.cs
@@ -13,6 +13,6 @@ public DetailsPage()
     private void OnRefreshButtonClick(object sender, RoutedEventArgs e)
     {
         BatteryInformation.RequestUpdate();
-        Application.Current.GetTrayIconWindow().RequestBatteryStatusUpdate();
+        Application.Current.GetNotifyIconWindow().RequestBatteryStatusUpdate();
     }
 }
diff --git a/Pack/Package.appxmanifest b/Pack/Package.appxmanifest
@@ -12,7 +12,7 @@
   <Identity
     Name="61867SoleonInnovation.BatteryPercentageIcon"
     Publisher="CN=B0B1FE5B-CC73-4F71-BD3F-7B809647826C"
-    Version="2.1.6.0" />
+    Version="2.1.7.0" />
 
   <Properties>
     <DisplayName>Battery Percentage Icon</DisplayName>