Release patch version 5.0.3 to fix #446

t1m0thyj · May 28, 2022 · 9320889 · 9320889
1 parent cab75e8
commit 9320889
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,13 +1,18 @@
 # Changelog
 
+## `5.0.3`
+
+* Fixed IndexOutOfRangeException when Select Theme dialog is opened and there are multiple monitors. ([#446](https://github.com/t1m0thyj/WinDynamicDesktop/issues/446))
+
 ## `5.0.2`
 
-:warning: Version 5.0.0 had a bug causing automatic update checking to be disabled for fresh installs. If you want automatic updates, check that they are enabled in the system tray menu: More Options -> Check for updates once a week.
+**Note:** Version 5.0.0 had a bug causing automatic update checking to be disabled for fresh installs. If you want automatic updates, check that they are enabled in the system tray menu: More Options -> Check for updates once a week.
 
 * Updated LocationIQ geocoding provider to stop using endpoint that will be deprecated on June 1
 * Fixed display names shown in wrong order in theme dialog ([#420](https://github.com/t1m0thyj/WinDynamicDesktop/issues/420))
 * Fixed background not updating when night mode is toggled ([#425](https://github.com/t1m0thyj/WinDynamicDesktop/issues/425))
 * Fixed user-defined sunrise and sunset times being stored in wrong locale format ([#432](https://github.com/t1m0thyj/WinDynamicDesktop/issues/432))
+* Added Azerbaijani and Hebrew translations (thanks Arzu and elie7han)
 
 ## `5.0.1`
 

diff --git a/src/ThemeDialog.cs b/src/ThemeDialog.cs
@@ -98,6 +98,19 @@ public void ImportThemes(List<string> themePaths)
             importDialog.InitImport(themePaths);
         }
 
+        private string[] GetDisplayNames()
+        {
+            // https://github.com/winleafs/Winleafs/blob/98ba3ba/Winleafs.Wpf/Helpers/ScreenBoundsHelper.cs#L36=
+            var activeDisplayDevicePaths = WindowsDisplayAPI.Display.GetDisplays().Select(d => d.DevicePath);
+            var displayTargets = PathDisplayTarget.GetDisplayTargets()
+                .Where(dt => activeDisplayDevicePaths.Contains(dt.DevicePath)).ToArray();
+            return Screen.AllScreens.Select((screen, i) => new KeyValuePair<string, int>(screen.DeviceName, i))
+                .OrderBy(x => x.Key).Select(x => {
+                    string displayName = displayTargets[x.Value].FriendlyName;
+                    return string.IsNullOrEmpty(displayName) ? _("Internal Display") : displayName;
+                }).ToArray();
+        }
+
         private void LoadThemes(List<ThemeConfig> themes, string activeTheme = null)
         {
             Size thumbnailSize = ThemeThumbLoader.GetThumbnailSize(this);
@@ -301,18 +314,9 @@ private void ThemeDialog_Load(object sender, EventArgs e)
 
             if (UwpDesktop.IsMultiDisplaySupported())
             {
-                var displayDevicePaths = WindowsDisplayAPI.Display.GetDisplays().Select(x => x.DevicePath);
-                var displayTargets = PathDisplayTarget.GetDisplayTargets()
-                    .Where(x => displayDevicePaths.Contains(x.DevicePath)).ToArray();
-                string[] displayNames = Screen.AllScreens
-                    .Select((screen, i) => new KeyValuePair<string, int>(screen.DeviceName, i))
-                    .OrderBy(x => x.Key).Select(x => displayTargets[x.Value].FriendlyName).ToArray();
+                string[] displayNames = GetDisplayNames();
                 for (int i = 0; i < displayNames.Length; i++)
                 {
-                    if (string.IsNullOrEmpty(displayNames[i]))
-                    {
-                        displayNames[i] = _("Internal Display");
-                    }
                     displayComboBox.Items.Add(string.Format(_("Display {0}: {1}"), i + 1, displayNames[i]));
                 }
             }

diff --git a/src/WinDynamicDesktop.csproj b/src/WinDynamicDesktop.csproj
@@ -9,7 +9,7 @@
     <PackageId>WinDynamicDesktop</PackageId>
     <Product>WinDynamicDesktop</Product>
     <Copyright>Copyright © 2022 Timothy Johnson</Copyright>
-    <Version>5.0.2</Version>
+    <Version>5.0.3</Version>
     <ApplicationIcon>resources\WinDynamicDesktop.ico</ApplicationIcon>
     <UseWindowsForms>true</UseWindowsForms>
     <UseWPF>true</UseWPF>

diff --git a/uwp/Package.appxmanifest b/uwp/Package.appxmanifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" xmlns:uap3="http://schemas.microsoft.com/appx/manifest/uap/windows10/3" xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities" xmlns:desktop="http://schemas.microsoft.com/appx/manifest/desktop/windows10" IgnorableNamespaces="uap uap3 mp rescap desktop">
-  <Identity Name="38719TimothyJohnson.WinDynamicDesktop" Publisher="CN=3C822DA5-D64C-40A9-A84A-5502C3EDD8CD" Version="5.0.2.0" />
+  <Identity Name="38719TimothyJohnson.WinDynamicDesktop" Publisher="CN=3C822DA5-D64C-40A9-A84A-5502C3EDD8CD" Version="5.0.3.0" />
   <Properties>
     <DisplayName>WinDynamicDesktop</DisplayName>
     <PublisherDisplayName>Timothy Johnson</PublisherDisplayName>