mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-07-04 01:53:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2708 from RyanDwyer/fix-output-disconnect-crash

Browse source 
Fix crash when disconnecting output
This commit is contained in:
emersion 2018-09-25 09:36:25 +02:00 committed by GitHub
parent a032925ae7 b1a0e95e8e
commit 08815f9cfb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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);