diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-08-24 08:27:05 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-24 08:27:05 -0400 |
| commit | e86d99acd655815781cd2e23877ce58ab5b24826 (patch) | |
| tree | 5e056a7859751c68c0cfb425fc6f37599c3f7400 /sway/config/output.c | |
| parent | f53c28d52a6954108592c246c013c0c4b076f09c (diff) | |
| parent | b6058703fa240780d66fac8ef96982c66b2b0263 (diff) | |
Merge pull request #2499 from RyanDwyer/refactor-destroy-functions
Refactor destroy functions and save workspaces when there's no outputs
Diffstat (limited to 'sway/config/output.c')
| -rw-r--r-- | sway/config/output.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sway/config/output.c b/sway/config/output.c index 1d8cb3ef..7f9b1007 100644 --- a/sway/config/output.c +++ b/sway/config/output.c @@ -181,13 +181,11 @@ void apply_output_config(struct output_config *oc, struct sway_container *output struct wlr_output *wlr_output = output->sway_output->wlr_output; if (oc && oc->enabled == 0) { - struct sway_output *sway_output = output->sway_output; if (output->sway_output->bg_pid != 0) { terminate_swaybg(output->sway_output->bg_pid); output->sway_output->bg_pid = 0; } - container_destroy(output); - sway_output->swayc = NULL; + output_begin_destroy(output); wlr_output_layout_remove(root_container.sway_root->output_layout, wlr_output); return; |