Miroirs/sway-patched-tray-menu
1
0
Fork 0
mirror of https://github.com/NickHu/sway synced 2025-01-29 08:34:13 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix null pointer crash when doing tiling drag

Browse source 
* Create layout S[V[view view] view]
* Drag bottom view to the top
* Sway would crash when the cursor hovers the V[view view] title while
dragging
This commit is contained in:
Ryan Dwyer 2019-03-29 18:29:34 +10:00 • committed by Drew DeVault
parent bfdee1319f
commit 2cae0d5e3a
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sway/input/seatop_move_tiling.c
View file

@ -108,7 +108,7 @@ static void handle_motion_postthreshold(struct sway_seat *seat) {
} }
if (node->type == N_WORKSPACE) { if (node->type == N_WORKSPACE) {
// Emtpy workspace // Empty workspace
e->target_node = node; e->target_node = node;
e->target_edge = WLR_EDGE_NONE; e->target_edge = WLR_EDGE_NONE;
workspace_get_box(node->sway_workspace, &e->drop_box); workspace_get_box(node->sway_workspace, &e->drop_box);
@ -164,7 +164,7 @@ static void handle_motion_postthreshold(struct sway_seat *seat) {
// Use the hovered view - but we must be over the actual surface // Use the hovered view - but we must be over the actual surface
con = node->sway_container; con = node->sway_container;
if (!con->view->surface || node == &e->con->node if (!con->view || !con->view->surface || node == &e->con->node
|| node_has_ancestor(node, &e->con->node)) { || node_has_ancestor(node, &e->con->node)) {
e->target_node = NULL; e->target_node = NULL;
e->target_edge = WLR_EDGE_NONE; e->target_edge = WLR_EDGE_NONE;