From 1964afb854dc13731e19fd8366399d83c89b62d0 Mon Sep 17 00:00:00 2001 From: Benedikt Stebner Date: Tue, 28 Mar 2023 14:15:24 +0200 Subject: [PATCH] Fix possible NRE --- src/Avalonia.Controls/SelectableTextBlock.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Avalonia.Controls/SelectableTextBlock.cs b/src/Avalonia.Controls/SelectableTextBlock.cs index 8622720236..66ae4a26bb 100644 --- a/src/Avalonia.Controls/SelectableTextBlock.cs +++ b/src/Avalonia.Controls/SelectableTextBlock.cs @@ -228,7 +228,7 @@ namespace Avalonia.Controls { base.OnPointerPressed(e); - var text = HasComplexContent ? Inlines.Text : Text; + var text = HasComplexContent ? Inlines?.Text : Text; var clickInfo = e.GetCurrentPoint(this); if (text != null && clickInfo.Properties.IsLeftButtonPressed) @@ -314,7 +314,7 @@ namespace Avalonia.Controls // selection should not change during pointer move if the user right clicks if (e.Pointer.Captured == this && e.GetCurrentPoint(this).Properties.IsLeftButtonPressed) { - var text = HasComplexContent ? Inlines.Text : Text; + var text = HasComplexContent ? Inlines?.Text : Text; var padding = Padding; var point = e.GetPosition(this) - new Point(padding.Left, padding.Top); @@ -397,7 +397,7 @@ namespace Avalonia.Controls private string GetSelection() { - var text = HasComplexContent ? Inlines.Text : Text; + var text = HasComplexContent ? Inlines?.Text : Text; var textLength = text?.Length ?? 0;