alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix crash when disconnecting output

Browse source 
If the output being disconnected contains views, and the views are being
relocated to another output of a different size, a transaction must
occur to reconfigure them. This means by the time
container_discover_outputs is called, the output is already disabled and
wlr_output is NULL.

I considered making it check output->wlr_output, but output->enabled
should work just as well and is more descriptive.
This commit is contained in:
Ryan Dwyer 2018-09-25 08:21:22 +10:00
parent a032925ae7
commit b1a0e95e8e
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sway/tree/container.c
View file

@ -985,7 +985,8 @@ void container_discover_outputs(struct sway_container *con) {
} }
} }
struct sway_output *new_output = container_get_effective_output(con); struct sway_output *new_output = container_get_effective_output(con);
double old_scale = old_output ? old_output->wlr_output->scale : -1; double old_scale = old_output && old_output->enabled ?
old_output->wlr_output->scale : -1;
double new_scale = new_output ? new_output->wlr_output->scale : -1; double new_scale = new_output ? new_output->wlr_output->scale : -1;
if (old_scale != new_scale) { if (old_scale != new_scale) {
container_update_title_textures(con); container_update_title_textures(con);