Catch ManagementExceptions when starting WindowsThemeService

lay295 · Nov 7, 2023 · 6842fe5 · 6842fe5
1 parent d32729c
commit 6842fe5
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 10 deletions.
diff --git a/TwitchDownloaderWPF/Services/WindowsThemeService.cs b/TwitchDownloaderWPF/Services/WindowsThemeService.cs
@@ -41,7 +41,13 @@ public WindowsThemeService()
             }
             catch (ExternalException e)
             {
-                MessageBox.Show(string.Format(Translations.Strings.UnableToStartWindowsThemeWatcher, $"0x{e.ErrorCode:x8}"), Translations.Strings.MessageBoxTitleError, MessageBoxButton.OK, MessageBoxImage.Error);
+                MessageBox.Show(string.Format(Translations.Strings.UnableToStartWindowsThemeWatcher, $"0x{e.ErrorCode:x8}"), Translations.Strings.MessageBoxTitleError,
+                    MessageBoxButton.OK, MessageBoxImage.Information);
+            }
+            catch (ManagementException e)
+            {
+                MessageBox.Show(string.Format(Translations.Strings.UnableToStartWindowsThemeWatcher, $"{e.ErrorCode} (0x{(int)e.ErrorCode:x8})"), Translations.Strings.MessageBoxTitleError,
+                    MessageBoxButton.OK, MessageBoxImage.Information);
             }
         }
 

diff --git a/TwitchDownloaderWPF/Translations/Strings.Designer.cs b/TwitchDownloaderWPF/Translations/Strings.Designer.cs
diff --git a/TwitchDownloaderWPF/Translations/Strings.fr.resx b/TwitchDownloaderWPF/Translations/Strings.fr.resx
@@ -769,7 +769,7 @@
     <value>Erreur</value>
   </data>
   <data name="UnableToStartWindowsThemeWatcher" xml:space="preserve">
-    <value>Impossible de démarrer l'observateur de thème de l'application Windows. Code d'erreur : {0}</value>
+    <value>Impossible de démarrer l'observateur de thème de l'application Windows. La synchronisation des thèmes Windows en temps réel a été désactivée. Code d'erreur : {0}</value>
   </data>
   <data name="LabelVideosPerPage" xml:space="preserve">
     <value>Vidéos par page:</value>

diff --git a/TwitchDownloaderWPF/Translations/Strings.resx b/TwitchDownloaderWPF/Translations/Strings.resx
@@ -768,7 +768,7 @@
     <value>Error</value>
   </data>
   <data name="UnableToStartWindowsThemeWatcher" xml:space="preserve">
-    <value>Unable to start Windows application theme watcher. Error code: {0}</value>
+    <value>Unable to start Windows application theme watcher. Real-time Windows theme synchronization has been disabled. Error code: {0}</value>
   </data>
   <data name="LabelVideosPerPage" xml:space="preserve">
     <value>Videos per page:</value>

diff --git a/TwitchDownloaderWPF/TwitchDownloaderWPF.csproj b/TwitchDownloaderWPF/TwitchDownloaderWPF.csproj
@@ -42,14 +42,14 @@
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Themes\Dark.xaml">
-      <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
-      <SubType>Designer</SubType>
-      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </EmbeddedResource>
     <EmbeddedResource Include="Themes\Light.xaml">
-      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Themes\README.txt">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </EmbeddedResource>
-    <EmbeddedResource Include="Themes\README.txt" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\TwitchDownloaderCore\TwitchDownloaderCore.csproj" />