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.
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

View file

@ -251,6 +251,9 @@ static void output_for_each_surface(struct sway_output *output,
};
struct sway_workspace *workspace = output_get_active_workspace(output);
if (!workspace) {
return;
}
struct sway_container *fullscreen_con = root->fullscreen_global;
if (fullscreen_con && container_is_scratchpad_hidden(fullscreen_con)) {
fullscreen_con = NULL;