From 8080cb5f1b23324b406cc671fd1a925d9557c0dc Mon Sep 17 00:00:00 2001 From: Stijn Oostdam Date: Thu, 8 Oct 2020 21:23:48 +0200 Subject: [PATCH] Fixed a bug where Winleafs would crash if the device type could not be determined --- Winleafs.Models/Models/UserSettings.cs | 2 +- Winleafs.Setup/Product.wxs | 2 +- Winleafs.Setup/Winleafs.wxs | 1164 +++++++++-------- .../Views/MainWindows/DeviceUserControl.xaml | 1 + .../MainWindows/DeviceUserControl.xaml.cs | 3 + 5 files changed, 595 insertions(+), 577 deletions(-) diff --git a/Winleafs.Models/Models/UserSettings.cs b/Winleafs.Models/Models/UserSettings.cs index 0f3a29c1..b8e5e2ac 100644 --- a/Winleafs.Models/Models/UserSettings.cs +++ b/Winleafs.Models/Models/UserSettings.cs @@ -16,7 +16,7 @@ namespace Winleafs.Models.Models public class UserSettings { public static readonly string APPLICATIONNAME = "Winleafs"; - public static readonly string APPLICATIONVERSION = "v1.1.4"; + public static readonly string APPLICATIONVERSION = "v1.1.5"; public static readonly string SettingsFolder = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), APPLICATIONNAME); diff --git a/Winleafs.Setup/Product.wxs b/Winleafs.Setup/Product.wxs index 1c68d2f2..2a9f95f8 100644 --- a/Winleafs.Setup/Product.wxs +++ b/Winleafs.Setup/Product.wxs @@ -1,6 +1,6 @@ - + diff --git a/Winleafs.Setup/Winleafs.wxs b/Winleafs.Setup/Winleafs.wxs index 5c7af90c..28c9e6db 100644 --- a/Winleafs.Setup/Winleafs.wxs +++ b/Winleafs.Setup/Winleafs.wxs @@ -2,1692 +2,1705 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - + - - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + - + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + - + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -1759,11 +1772,7 @@ - - - - @@ -1794,8 +1803,6 @@ - - @@ -1985,8 +1992,6 @@ - - @@ -2011,6 +2016,8 @@ + + @@ -2028,6 +2035,8 @@ + + @@ -2065,6 +2074,7 @@ + @@ -2083,6 +2093,7 @@ + @@ -2154,6 +2165,8 @@ + + @@ -2192,6 +2205,7 @@ + diff --git a/Winleafs.Wpf/Views/MainWindows/DeviceUserControl.xaml b/Winleafs.Wpf/Views/MainWindows/DeviceUserControl.xaml index 0b6937d0..3947785e 100644 --- a/Winleafs.Wpf/Views/MainWindows/DeviceUserControl.xaml +++ b/Winleafs.Wpf/Views/MainWindows/DeviceUserControl.xaml @@ -20,6 +20,7 @@ + diff --git a/Winleafs.Wpf/Views/MainWindows/DeviceUserControl.xaml.cs b/Winleafs.Wpf/Views/MainWindows/DeviceUserControl.xaml.cs index 1ddfd86a..72996918 100644 --- a/Winleafs.Wpf/Views/MainWindows/DeviceUserControl.xaml.cs +++ b/Winleafs.Wpf/Views/MainWindows/DeviceUserControl.xaml.cs @@ -65,6 +65,9 @@ public DeviceUserControl(Device device, MainWindow parent) case DeviceType.Hexagon: HexagonIcon.Visibility = Visibility.Visible; break; + case DeviceType.Unknown: + UnknownIcon.Visibility = Visibility.Visible; + break; default: throw new NotImplementedException($"No icon implemented for device type {orchestrator.PanelLayout.DeviceType}"); }