Merge branch 'master' into android_lifecycle

3 years ago · ccf7150e88
1 changed files with 1 additions and 1 deletions
--- a/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs
+++ b/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs
@ -294,7 +294,7 @@ namespace Avalonia.Android.Platform.SkiaPlatform

            IsComposing = true;

-            _inputMethod.Client.SetPreeditText(ComposingText);
+            _inputMethod.Client?.SetPreeditText(ComposingText);

            return base.SetComposingText(text, newCursorPosition);
        }