summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThaddeus Crews <repiteo@outlook.com>2024-11-18 09:23:34 -0600
committerThaddeus Crews <repiteo@outlook.com>2024-11-18 09:23:34 -0600
commit778f26e69ed4e9531754926ecc708dacef062a5e (patch)
tree1841457aa104dbb47ab6bc23376d7a3ac0889207
parent2dbf195af545e4d551c2c75602c61de1df18e36b (diff)
parent0d9a705e253d7f91d68aa5c2477d708c71746a1e (diff)
downloadredot-engine-778f26e69ed4e9531754926ecc708dacef062a5e.tar.gz
Merge pull request #99372 from tdaven/fix-inconsistent-wayland-clipboard
Wayland: Only set selection when there is not already a source.
-rw-r--r--platform/linuxbsd/wayland/wayland_thread.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/platform/linuxbsd/wayland/wayland_thread.cpp b/platform/linuxbsd/wayland/wayland_thread.cpp
index e066e78e5b..d8d58ba54b 100644
--- a/platform/linuxbsd/wayland/wayland_thread.cpp
+++ b/platform/linuxbsd/wayland/wayland_thread.cpp
@@ -3988,10 +3988,10 @@ void WaylandThread::selection_set_text(const String &p_text) {
wl_data_source_add_listener(ss->wl_data_source_selection, &wl_data_source_listener, ss);
wl_data_source_offer(ss->wl_data_source_selection, "text/plain;charset=utf-8");
wl_data_source_offer(ss->wl_data_source_selection, "text/plain");
- }
- // TODO: Implement a good way of getting the latest serial from the user.
- wl_data_device_set_selection(ss->wl_data_device, ss->wl_data_source_selection, MAX(ss->pointer_data.button_serial, ss->last_key_pressed_serial));
+ // TODO: Implement a good way of getting the latest serial from the user.
+ wl_data_device_set_selection(ss->wl_data_device, ss->wl_data_source_selection, MAX(ss->pointer_data.button_serial, ss->last_key_pressed_serial));
+ }
// Wait for the message to get to the server before continuing, otherwise the
// clipboard update might come with a delay.