jachym/dwl
1
0
Fork 0
mirror of https://codeberg.org/dwl/dwl.git synced 2025-10-27 02:04:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Prevent call to wlr_addon_find if addon list is invalid

Browse Source
This commit is contained in:
Forrest Bushstone 2024-06-10 15:46:31 -04:00
parent 21205f2f40
commit 831e3557a0
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client.h
View File

@ -38,7 +38,7 @@ toplevel_from_wlr_surface(struct wlr_surface *s, Client **pc, LayerSurface **pl)
struct wlr_xwayland_surface *xsurface; struct wlr_xwayland_surface *xsurface;
#endif #endif
if (!s) if (!s || (!s->addons.addons.prev && !s->addons.addons.next))
return -1; return -1;
root_surface = wlr_surface_get_root_surface(s); root_surface = wlr_surface_get_root_surface(s);

5
dwl.c
View File

@ -1808,8 +1808,9 @@ motionnotify(uint32_t time, struct wlr_input_device *device, double dx, double d
/* Find the client under the pointer and send the event along. */ /* Find the client under the pointer and send the event along. */
xytonode(cursor->x, cursor->y, &surface, &c, NULL, &sx, &sy); xytonode(cursor->x, cursor->y, &surface, &c, NULL, &sx, &sy);
if (cursor_mode == CurPressed && !seat->drag && surface != held_grab if (cursor_mode == CurPressed && !seat->drag && surface != held_grab) {
&& toplevel_from_wlr_surface(held_grab, &w, &l) >= 0) { if (toplevel_from_wlr_surface(held_grab, &w, &l) < 0)
return;
c = w; c = w;
surface = held_grab; surface = held_grab;
sx = cursor->x - (l ? l->geom.x : w->geom.x); sx = cursor->x - (l ? l->geom.x : w->geom.x);