From c8f114a59a041a1fbc16375f881218823f94d7dc Mon Sep 17 00:00:00 2001
From: Julien Lebosquain <julien@lebosquain.net>
Date: Wed, 26 Nov 2025 09:10:10 +0100
Subject: [PATCH] Don't clear X11 clipboard if we still have the ownership
 (#20137)

---
 src/Avalonia.X11/Clipboard/X11Clipboard.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Avalonia.X11/Clipboard/X11Clipboard.cs b/src/Avalonia.X11/Clipboard/X11Clipboard.cs
index b257b0d525..f0f4561945 100644
--- a/src/Avalonia.X11/Clipboard/X11Clipboard.cs
+++ b/src/Avalonia.X11/Clipboard/X11Clipboard.cs
@@ -50,7 +50,10 @@ namespace Avalonia.X11.Clipboard
         {
             if (ev.type == XEventName.SelectionClear)
             {
-                _storedDataTransfer = null;
+                // We night have already regained the clipboard ownership by the time a SelectionClear message arrives.
+                if (GetOwner() != _handle)
+                    _storedDataTransfer = null;
+
                 _storeAtomTcs?.TrySetResult(true);
                 return;
             }