diff options
author | emersion <contact@emersion.fr> | 2018-09-25 09:36:25 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-25 09:36:25 +0200 |
commit | 08815f9cfb4d0e93d69997cb229333326212744b (patch) | |
tree | 9d414feadd74c7e015fe9ca4064d9a185de42cbe | |
parent | Merge pull request #2701 from RedSoxFan/input-wildcard (diff) | |
parent | Fix crash when disconnecting output (diff) | |
download | sway-08815f9cfb4d0e93d69997cb229333326212744b.tar.gz sway-08815f9cfb4d0e93d69997cb229333326212744b.tar.zst sway-08815f9cfb4d0e93d69997cb229333326212744b.zip |
Merge pull request #2708 from RyanDwyer/fix-output-disconnect-crash
Fix crash when disconnecting output
-rw-r--r-- | sway/tree/container.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sway/tree/container.c b/sway/tree/container.c index 53b127b7..329145cf 100644 --- a/sway/tree/container.c +++ b/sway/tree/container.c | |||
@@ -985,7 +985,8 @@ void container_discover_outputs(struct sway_container *con) { | |||
985 | } | 985 | } |
986 | } | 986 | } |
987 | struct sway_output *new_output = container_get_effective_output(con); | 987 | struct sway_output *new_output = container_get_effective_output(con); |
988 | double old_scale = old_output ? old_output->wlr_output->scale : -1; | 988 | double old_scale = old_output && old_output->enabled ? |
989 | old_output->wlr_output->scale : -1; | ||
989 | double new_scale = new_output ? new_output->wlr_output->scale : -1; | 990 | double new_scale = new_output ? new_output->wlr_output->scale : -1; |
990 | if (old_scale != new_scale) { | 991 | if (old_scale != new_scale) { |
991 | container_update_title_textures(con); | 992 | container_update_title_textures(con); |