diff options
author | Brian Ashworth <bosrsf04@gmail.com> | 2019-02-21 13:24:13 -0500 |
---|---|---|
committer | emersion <contact@emersion.fr> | 2019-02-21 21:18:03 +0100 |
commit | d3d7956576341bbbfb60d045175b0e8a44752e0b (patch) | |
tree | 0df81ca066ab77d569baf41623f652b1c7f8a638 /sway/ipc-json.c | |
parent | Merge pull request #3743 from RedSoxFan/fix-output-get-active-workspace (diff) | |
download | sway-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/ipc-json.c')
-rw-r--r-- | sway/ipc-json.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sway/ipc-json.c b/sway/ipc-json.c index 6d36c727..a2ab2bba 100644 --- a/sway/ipc-json.c +++ b/sway/ipc-json.c | |||
@@ -198,6 +198,9 @@ static void ipc_json_describe_output(struct sway_output *output, | |||
198 | ipc_json_output_transform_description(wlr_output->transform))); | 198 | ipc_json_output_transform_description(wlr_output->transform))); |
199 | 199 | ||
200 | struct sway_workspace *ws = output_get_active_workspace(output); | 200 | struct sway_workspace *ws = output_get_active_workspace(output); |
201 | if (!sway_assert(ws, "Expected output to have a workspace")) { | ||
202 | return; | ||
203 | } | ||
201 | json_object_object_add(object, "current_workspace", | 204 | json_object_object_add(object, "current_workspace", |
202 | json_object_new_string(ws->name)); | 205 | json_object_new_string(ws->name)); |
203 | 206 | ||