aboutsummaryrefslogtreecommitdiffstats
path: root/sway/tree/output.c
diff options
context:
space:
mode:
authorLibravatar Brian Ashworth <bosrsf04@gmail.com>2019-02-21 13:24:13 -0500
committerLibravatar emersion <contact@emersion.fr>2019-02-21 21:18:03 +0100
commitd3d7956576341bbbfb60d045175b0e8a44752e0b (patch)
tree0df81ca066ab77d569baf41623f652b1c7f8a638 /sway/tree/output.c
parentMerge pull request #3743 from RedSoxFan/fix-output-get-active-workspace (diff)
downloadsway-d3d7956576341bbbfb60d045175b0e8a44752e0b.tar.gz
sway-d3d7956576341bbbfb60d045175b0e8a44752e0b.tar.zst
sway-d3d7956576341bbbfb60d045175b0e8a44752e0b.zip
Handle NULL from output_get_active_workspace
This modifies the places where output_get_active_workspace is called to handle a NULL result. Some places already handled it and did not need a change, some just have guard off code blocks, others return errors, and some have sway_asserts since the case should never happen. A lot of this is probably just safety precautions since they probably will never be called when `output_get_active_workspace` is not fully configured with a workspace.
Diffstat (limited to 'sway/tree/output.c')
-rw-r--r--sway/tree/output.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/sway/tree/output.c b/sway/tree/output.c
index 146bc423..e0a66e0b 100644
--- a/sway/tree/output.c
+++ b/sway/tree/output.c
@@ -143,6 +143,9 @@ void output_enable(struct sway_output *output, struct output_config *oc) {
143static void evacuate_sticky(struct sway_workspace *old_ws, 143static void evacuate_sticky(struct sway_workspace *old_ws,
144 struct sway_output *new_output) { 144 struct sway_output *new_output) {
145 struct sway_workspace *new_ws = output_get_active_workspace(new_output); 145 struct sway_workspace *new_ws = output_get_active_workspace(new_output);
146 if (!sway_assert(new_ws, "New output does not have a workspace")) {
147 return;
148 }
146 while (old_ws->floating->length) { 149 while (old_ws->floating->length) {
147 struct sway_container *sticky = old_ws->floating->items[0]; 150 struct sway_container *sticky = old_ws->floating->items[0];
148 container_detach(sticky); 151 container_detach(sticky);