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

Fix crash when disconnecting output
This commit is contained in:
emersion 2018-09-25 09:36:25 +02:00 committed by GitHub
commit 08815f9cfb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -985,7 +985,8 @@ void container_discover_outputs(struct sway_container *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;
if (old_scale != new_scale) {
container_update_title_textures(con);