From a76eb7f58755f872d68693b24b58cb53e2905454 Mon Sep 17 00:00:00 2001
From: Tim <tim.uniewski@gmail.com>
Date: Wed, 8 Mar 2023 14:11:15 +0100
Subject: [PATCH] Add additional null check as Tip may be null in some
 situations

see https://github.com/AvaloniaUI/Avalonia/issues/10598
---
 src/Avalonia.Controls/ToolTipService.cs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/Avalonia.Controls/ToolTipService.cs b/src/Avalonia.Controls/ToolTipService.cs
index 9ec9013679..d983309a72 100644
--- a/src/Avalonia.Controls/ToolTipService.cs
+++ b/src/Avalonia.Controls/ToolTipService.cs
@@ -42,11 +42,12 @@ namespace Avalonia.Controls
                 {
                     Close(control);
                 }
-                else
+                else 
                 {
-                    var tip = control.GetValue(ToolTip.ToolTipProperty);
-
-                    tip!.Content = e.NewValue;
+                    if (control.GetValue(ToolTip.ToolTipProperty) is { } tip)
+                    {
+                        tip.Content = e.NewValue;
+                    }
                 }
             }
         }