diff options
| author |  Ryan Dwyer <ryandwyer1@gmail.com> | 2018-08-03 18:08:20 +1000 |
|---|---|---|
| committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-08-03 18:08:20 +1000 |
| commit | c17f0870ef1620e73b18f0b0ce8303c94027d19b (patch) | |
| tree | eb00ad1385d5632494b15e19a9c3afe9b16a8789 /include/sway/tree/container.h | |
| parent | Merge pull request #2408 from ianyfan/exit-nag (diff) | |
| download | sway-c17f0870ef1620e73b18f0b0ce8303c94027d19b.tar.gz sway-c17f0870ef1620e73b18f0b0ce8303c94027d19b.tar.zst sway-c17f0870ef1620e73b18f0b0ce8303c94027d19b.zip | |
Fix crash when moving cursor over a fullscreen split container
Calling container_at_view fails an assertion if the container isn't a
view. Calling tiling_container_at works correctly, as that function
checks if the container is a view and calls container_at_view if so.
Diffstat (limited to 'include/sway/tree/container.h')
| -rw-r--r-- | include/sway/tree/container.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h index c3942e9e..44ff9f7d 100644 --- a/include/sway/tree/container.h +++ b/include/sway/tree/container.h | |||
| @@ -234,9 +234,9 @@ struct sway_container *container_at(struct sway_container *workspace, | |||
| 234 | double lx, double ly, struct wlr_surface **surface, | 234 | double lx, double ly, struct wlr_surface **surface, |
| 235 | double *sx, double *sy); | 235 | double *sx, double *sy); |
| 236 | 236 | ||
| 237 | struct sway_container *container_at_view(struct sway_container *view, | 237 | struct sway_container *tiling_container_at( |
| 238 | double lx, double ly, struct wlr_surface **surface, | 238 | struct sway_container *con, double lx, double ly, |
| 239 | double *sx, double *sy); | 239 | struct wlr_surface **surface, double *sx, double *sy); |
| 240 | 240 | ||
| 241 | /** | 241 | /** |
| 242 | * Apply the function for each descendant of the container breadth first. | 242 | * Apply the function for each descendant of the container breadth first. |