mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Wayland copy: destroy data_source object before creating new one

Browse Source
This commit is contained in:
ManoloFLTK 2023-11-03 15:16:36 +01:00
parent a3f4c62826
commit eb3afb2033
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/drivers/Wayland/fl_wayland_clipboard_dnd.cxx
View File

@ -103,8 +103,9 @@ static wl_cursor* save_cursor = NULL; // non null when DnD uses "dnd-copy" curso
static void data_source_handle_cancelled(void *data, struct wl_data_source *source) { static void data_source_handle_cancelled(void *data, struct wl_data_source *source) {
// An application has replaced the clipboard contents or DnD finished // An application has replaced the clipboard contents or DnD finished
//fprintf(stderr, "data_source_handle_cancelled: %p\n", source);
wl_data_source_destroy(source); wl_data_source_destroy(source);
Fl_Wayland_Screen_Driver *scr_driver = (Fl_Wayland_Screen_Driver*)Fl::screen_driver();
if (scr_driver->seat->data_source == source) scr_driver->seat->data_source = NULL;
doing_dnd = false; doing_dnd = false;
if (dnd_icon) { if (dnd_icon) {
struct Fl_Wayland_Graphics_Driver::wld_buffer *off = struct Fl_Wayland_Graphics_Driver::wld_buffer *off =
@ -119,7 +120,6 @@ static void data_source_handle_cancelled(void *data, struct wl_data_source *sour
fl_i_own_selection[1] = 0; fl_i_own_selection[1] = 0;
if (data == 0) { // at end of DnD if (data == 0) { // at end of DnD
if (save_cursor) { if (save_cursor) {
Fl_Wayland_Screen_Driver *scr_driver = (Fl_Wayland_Screen_Driver*)Fl::screen_driver();
scr_driver->default_cursor(save_cursor); scr_driver->default_cursor(save_cursor);
scr_driver->set_cursor(); scr_driver->set_cursor();
save_cursor = NULL; save_cursor = NULL;