diff options
author | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-09-28 22:34:51 +1000 |
---|---|---|
committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-09-28 22:35:38 +1000 |
commit | 56e9f31b2f5ad057c3f6809fafc73132647ae686 (patch) | |
tree | afccb506b4f3354336479daa9da279339e5f862f /sway/tree/workspace.c | |
parent | Rename workspace_outputs to workspace_configs and fix memory leak (diff) | |
download | sway-56e9f31b2f5ad057c3f6809fafc73132647ae686.tar.gz sway-56e9f31b2f5ad057c3f6809fafc73132647ae686.tar.zst sway-56e9f31b2f5ad057c3f6809fafc73132647ae686.zip |
Check for NULL output in workspace_valid_on_output
Diffstat (limited to 'sway/tree/workspace.c')
-rw-r--r-- | sway/tree/workspace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sway/tree/workspace.c b/sway/tree/workspace.c index e592302c..d65a3e4c 100644 --- a/sway/tree/workspace.c +++ b/sway/tree/workspace.c | |||
@@ -128,7 +128,7 @@ void next_name_map(struct sway_container *ws, void *data) { | |||
128 | static bool workspace_valid_on_output(const char *output_name, | 128 | static bool workspace_valid_on_output(const char *output_name, |
129 | const char *ws_name) { | 129 | const char *ws_name) { |
130 | struct workspace_config *wsc = workspace_find_config(ws_name); | 130 | struct workspace_config *wsc = workspace_find_config(ws_name); |
131 | return !wsc || strcmp(wsc->output, output_name) == 0; | 131 | return !wsc || !wsc->output || strcmp(wsc->output, output_name) == 0; |
132 | } | 132 | } |
133 | 133 | ||
134 | static void workspace_name_from_binding(const struct sway_binding * binding, | 134 | static void workspace_name_from_binding(const struct sway_binding * binding, |