Browse Source

Merge branch 'master' into fixes/do-not-use-ui-thread-objects-in-platform-render-interface

pull/10842/head
Nikita Tsukanov 4 years ago
committed by GitHub
parent
commit
95121725bf
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      src/Windows/Avalonia.Win32/WindowImpl.AppWndProc.cs

2
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;

Loading…
Cancel
Save