From ec21caf7fe0419b2284e34d63cd13da6de9460dc Mon Sep 17 00:00:00 2001
From: 3dfxuser <3dfxuser@gmail.com>
Date: Wed, 2 Aug 2023 11:43:53 +0300
Subject: [PATCH] Add null check for TextInputMethodClient in
 OnSelectionChanged() method

---
 src/Android/Avalonia.Android/AndroidInputMethod.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Android/Avalonia.Android/AndroidInputMethod.cs b/src/Android/Avalonia.Android/AndroidInputMethod.cs
index 7d5130cf5d..f708d6936c 100644
--- a/src/Android/Avalonia.Android/AndroidInputMethod.cs
+++ b/src/Android/Avalonia.Android/AndroidInputMethod.cs
@@ -113,6 +113,11 @@ namespace Avalonia.Android
 
         private void OnSelectionChanged()
         {
+            if (Client is null)
+            {
+                return;
+            }
+
             var selection = Client.Selection;
 
             _imm.UpdateSelection(_host, selection.Start, selection.End, selection.Start, selection.End);