griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.0-release'

Browse Source
This commit is contained in:
Campbell Barton
2023-10-13 15:46:41 +11:00
parent 962d0d2bee 3e9403bd76
commit c814c0295d
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
intern/ghost/intern/GHOST_SystemWayland.cc
View File

@@ -2427,7 +2427,10 @@ static void data_device_handle_leave(void *data, wl_data_device * /*wl_data_devi
{
GWL_Seat *seat = static_cast<GWL_Seat *>(data);
std::lock_guard lock{seat->data_offer_dnd_mutex};
/* The user may have only dragged over the window decorations. */
if (seat->data_offer_dnd == nullptr) {
return;
}
CLOG_INFO(LOG, 2, "leave");
dnd_events(seat, GHOST_kEventDraggingExited);
@@ -2448,6 +2451,10 @@ static void data_device_handle_motion(void *data,
{
GWL_Seat *seat = static_cast<GWL_Seat *>(data);
std::lock_guard lock{seat->data_offer_dnd_mutex};
/* The user may have only dragged over the window decorations. */
if (seat->data_offer_dnd == nullptr) {
return;
}
CLOG_INFO(LOG, 2, "motion");
@@ -2462,6 +2469,8 @@ static void data_device_handle_drop(void *data, wl_data_device * /*wl_data_devic
GWL_Seat *seat = static_cast<GWL_Seat *>(data);
std::lock_guard lock{seat->data_offer_dnd_mutex};
/* No need to check this for null (as other callbacks do).
* because the the data-offer has not been accepted (actions set... etc). */
GWL_DataOffer *data_offer = seat->data_offer_dnd;
/* Use a blank string for `mime_receive` to prevent crashes, although could also be `nullptr`.