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/desktop | |
| parent | 79c133182d85342748b284e20e1e634821ce419c (diff) | |
| download | sway-d3d7956576341bbbfb60d045175b0e8a44752e0b.tar.xz | |
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/desktop')
| -rw-r--r-- | sway/desktop/output.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sway/desktop/output.c b/sway/desktop/output.c index 61beb7af..d7d3fc07 100644 --- a/sway/desktop/output.c +++ b/sway/desktop/output.c @@ -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; |