Merge pull request #405 from emoacht/hotfix

Hotfix
emoacht · Jan 4, 2023 · 7f86a89 · 7f86a89
2 parents 3af6159 + 7997d28
commit 7f86a89
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 11 deletions.
diff --git a/Source/Installer/Product.wxs b/Source/Installer/Product.wxs
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-	<Product Id="*" Name="Monitorian" Manufacturer="emoacht" Version="4.0.0"
+	<Product Id="*" Name="Monitorian" Manufacturer="emoacht" Version="4.0.1"
 			 Language="1033" Codepage="1252" UpgradeCode="{81A4D148-75D3-462E-938D-8C208FB48E3C}">
 		<Package Id="*" InstallerVersion="500" Compressed="yes"
 				 InstallScope="perMachine" InstallPrivileges="elevated"

diff --git a/Source/Monitorian.Core/Properties/AssemblyInfo.cs b/Source/Monitorian.Core/Properties/AssemblyInfo.cs
@@ -33,8 +33,8 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("4.0.0.0")]
-[assembly: AssemblyFileVersion("4.0.0.0")]
+[assembly: AssemblyVersion("4.0.1.0")]
+[assembly: AssemblyFileVersion("4.0.1.0")]
 [assembly: NeutralResourcesLanguage("en-US")]
 
 // For unit test

diff --git a/Source/Monitorian.Core/Views/WindowPainter.cs b/Source/Monitorian.Core/Views/WindowPainter.cs
@@ -143,9 +143,8 @@ public string GetIconPath()
 		{
 			return Theme switch
 			{
-				ColorTheme.Dark => "pack://application:,,,/Monitorian.Core;component/Resources/Icons/DarkTrayIcon.ico",
 				ColorTheme.Light => "pack://application:,,,/Monitorian.Core;component/Resources/Icons/LightTrayIcon.ico",
-				_ => null
+				ColorTheme.Dark or _ => "pack://application:,,,/Monitorian.Core;component/Resources/Icons/DarkTrayIcon.ico",
 			};
 		}
 

diff --git a/Source/Monitorian/Properties/AssemblyInfo.cs b/Source/Monitorian/Properties/AssemblyInfo.cs
@@ -51,7 +51,7 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("4.0.0.0")]
-[assembly: AssemblyFileVersion("4.0.0.0")]
+[assembly: AssemblyVersion("4.0.1.0")]
+[assembly: AssemblyFileVersion("4.0.1.0")]
 [assembly: Guid("a4cc5362-9b08-465b-ad64-5cfabc72a4c7")]
 [assembly: NeutralResourcesLanguage("en-US")]
diff --git a/Source/ScreenFrame/Painter/ThemeInfo.cs b/Source/ScreenFrame/Painter/ThemeInfo.cs
@@ -31,13 +31,13 @@ private static ColorTheme GetTheme(string valueName)
 		{
 			const string keyName = @"Software\Microsoft\Windows\CurrentVersion\Themes\Personalize"; // HKCU
 
+			// A specified value may not exist if light theme has never been selected.
 			using var key = Registry.CurrentUser.OpenSubKey(keyName);
 
 			return key?.GetValue(valueName) switch
 			{
-				0 => ColorTheme.Dark,
 				1 => ColorTheme.Light,
-				_ => ColorTheme.Unknown
+				0 or _ => ColorTheme.Dark
 			};
 		}
 	}

diff --git a/Source/ScreenFrame/Properties/AssemblyInfo.cs b/Source/ScreenFrame/Properties/AssemblyInfo.cs
@@ -33,6 +33,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("4.0.0.0")]
-[assembly: AssemblyFileVersion("4.0.0.0")]
+[assembly: AssemblyVersion("4.0.1.0")]
+[assembly: AssemblyFileVersion("4.0.1.0")]
 [assembly: NeutralResourcesLanguage("en-US")]