mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-04 13:29:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Handle NULL from output_get_active_workspace

Browse source 
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.
This commit is contained in:
Brian Ashworth 2019-02-21 13:24:13 -05:00 • committed by emersion
parent 79c133182d
commit d3d7956576
10 changed files with 50 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
sway/ipc-json.c
View file

@ -198,6 +198,9 @@ static void ipc_json_describe_output(struct sway_output *output,
ipc_json_output_transform_description(wlr_output->transform)));
struct sway_workspace *ws = output_get_active_workspace(output);
if (!sway_assert(ws, "Expected output to have a workspace")) {
return;
}
json_object_object_add(object, "current_workspace",
json_object_new_string(ws->name));