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/input/cursor.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/input/cursor.c')
-rw-r--r-- | sway/input/cursor.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sway/input/cursor.c b/sway/input/cursor.c index 170532be..3236c74a 100644 --- a/sway/input/cursor.c +++ b/sway/input/cursor.c | |||
@@ -104,6 +104,9 @@ struct sway_node *node_at_coords( | |||
104 | 104 | ||
105 | // find the focused workspace on the output for this seat | 105 | // find the focused workspace on the output for this seat |
106 | struct sway_workspace *ws = output_get_active_workspace(output); | 106 | struct sway_workspace *ws = output_get_active_workspace(output); |
107 | if (!ws) { | ||
108 | return NULL; | ||
109 | } | ||
107 | 110 | ||
108 | if ((*surface = layer_surface_at(output, | 111 | if ((*surface = layer_surface_at(output, |
109 | &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY], | 112 | &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY], |