From b10eaecba2d3849627e9dfc415caac536e549854 Mon Sep 17 00:00:00 2001 From: BornToBeRoot Date: Sat, 13 Feb 2021 02:35:27 +0100 Subject: [PATCH] Fix app crash if MAC address is empty, return empty string --- .../PhysicalAddressToStringConverter.cs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Source/NETworkManager.Converters/PhysicalAddressToStringConverter.cs b/Source/NETworkManager.Converters/PhysicalAddressToStringConverter.cs index 7e7644468f..cdfe309015 100644 --- a/Source/NETworkManager.Converters/PhysicalAddressToStringConverter.cs +++ b/Source/NETworkManager.Converters/PhysicalAddressToStringConverter.cs @@ -10,7 +10,12 @@ public sealed class PhysicalAddressToStringConverter : IValueConverter { public object Convert(object value, Type targetType, object parameter, CultureInfo culture) { - return value == null ? string.Empty : MACAddressHelper.GetDefaultFormat((PhysicalAddress)value); + if (!(value is PhysicalAddress physicalAddress)) + return string.Empty; + + string macAddress = physicalAddress.ToString(); + + return string.IsNullOrEmpty(macAddress) ? string.Empty : MACAddressHelper.GetDefaultFormat(macAddress); } public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)