From b2a4e85e23b78ec031be0bb6b12fffc1b8cd5528 Mon Sep 17 00:00:00 2001
From: Benedikt Stebner <Gillibald@users.noreply.github.com>
Date: Wed, 29 Mar 2023 14:20:46 +0200
Subject: [PATCH] Only bypass WM_CHAR if previous composition is not empty

---
 src/Windows/Avalonia.Win32/WindowImpl.AppWndProc.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Windows/Avalonia.Win32/WindowImpl.AppWndProc.cs b/src/Windows/Avalonia.Win32/WindowImpl.AppWndProc.cs
index 39bdb942e1..84f27f080e 100644
--- a/src/Windows/Avalonia.Win32/WindowImpl.AppWndProc.cs
+++ b/src/Windows/Avalonia.Win32/WindowImpl.AppWndProc.cs
@@ -729,7 +729,7 @@ namespace Avalonia.Win32
                         {
                             case GCS.GCS_RESULTSTR:                          
                                 {
-                                    if(ToInt32(wParam) >= 32)
+                                    if(!string.IsNullOrEmpty(previousComposition) && ToInt32(wParam) >= 32)
                                     {
                                         Imm32InputMethod.Current.Composition = previousComposition;