hyprwm
/
Hyprland
mirror of https://github.com/hyprwm/Hyprland
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

data-device: properly abort drag on missing device 

sometimes there is no focused device (e.g. when dnd'ing on nothing or xwayland) in which case abort would fail to send cancelled to the source.

ref #6543
This commit is contained in:
Vaxry 2024-06-16 20:56:50 +02:00
parent 172ee1cada
commit d5ef10abf4
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/protocols/core/DataDevice.cpp
View File

@ -644,11 +644,13 @@ void CWLDataDeviceProtocol::abortDrag() {
g_pInputManager->unsetCursorImage();
dnd.overriddenCursor = false;
if (!dnd.focusedDevice || !dnd.currentSource)
if (!dnd.focusedDevice && !dnd.currentSource)
return;
dnd.focusedDevice->sendLeave();
dnd.currentSource->cancelled();
if (dnd.focusedDevice)
dnd.focusedDevice->sendLeave();
if (dnd.currentSource)
dnd.currentSource->cancelled();
dnd.focusedDevice.reset();
dnd.currentSource.reset();