diff --git a/MapControl/Avalonia/MapItem.Avalonia.cs b/MapControl/Avalonia/MapItem.Avalonia.cs index 5d85601c..44a52318 100644 --- a/MapControl/Avalonia/MapItem.Avalonia.cs +++ b/MapControl/Avalonia/MapItem.Avalonia.cs @@ -19,8 +19,11 @@ if (!e.Handled) { e.Handled = true; - (ItemsControl.ItemsControlFromItemContainer(this) as MapItemsControl)? - .OnItemClicked(this, e.KeyModifiers.HasFlag(KeyModifiers.Control)); + + if (ItemsControl.ItemsControlFromItemContainer(this) is MapItemsControl mapItemsControl) + { + mapItemsControl.OnItemClicked(this, e.KeyModifiers.HasFlag(KeyModifiers.Control)); + } } } } diff --git a/MapControl/WPF/MapItem.WPF.cs b/MapControl/WPF/MapItem.WPF.cs index b5e8dcb0..1f7c8945 100644 --- a/MapControl/WPF/MapItem.WPF.cs +++ b/MapControl/WPF/MapItem.WPF.cs @@ -28,8 +28,11 @@ namespace MapControl if (!e.Handled) { e.Handled = true; - (ItemsControl.ItemsControlFromItemContainer(this) as MapItemsControl)? - .OnItemClicked(this, Keyboard.Modifiers.HasFlag(ModifierKeys.Control)); + + if (ItemsControl.ItemsControlFromItemContainer(this) is MapItemsControl mapItemsControl) + { + mapItemsControl.OnItemClicked(this, Keyboard.Modifiers.HasFlag(ModifierKeys.Control)); + } } } diff --git a/MapControl/WinUI/MapItem.WinUI.cs b/MapControl/WinUI/MapItem.WinUI.cs index 30193541..1f703776 100644 --- a/MapControl/WinUI/MapItem.WinUI.cs +++ b/MapControl/WinUI/MapItem.WinUI.cs @@ -44,8 +44,11 @@ namespace MapControl if (!e.Handled) { e.Handled = true; - (ItemsControl.ItemsControlFromItemContainer(this) as MapItemsControl)? - .OnItemClicked(this, e.KeyModifiers.HasFlag(VirtualKeyModifiers.Control)); + + if (ItemsControl.ItemsControlFromItemContainer(this) is MapItemsControl mapItemsControl) + { + mapItemsControl.OnItemClicked(this, e.KeyModifiers.HasFlag(VirtualKeyModifiers.Control)); + } } }