diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-10-17 16:13:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-17 16:13:05 +0200 |
| commit | e46c3ffbc9f3cf51f08b3b9a0ae1c62e7ddd0a9a (patch) | |
| tree | e5d745938b5ad46e049d3c04886ef3311dcb5f23 | |
| parent | 765c80e5f7c36df77e9475a662648a0d87b93606 (diff) | |
| parent | 17014c34e2f3568af06b4fc9323256d2b7aa8947 (diff) | |
Merge pull request #2861 from RyanDwyer/fix-empty-workspace-crashes
Fix crashes when running certain commands on an empty workspace
| -rw-r--r-- | sway/commands/border.c | 2 | ||||
| -rw-r--r-- | sway/commands/mark.c | 2 | ||||
| -rw-r--r-- | sway/commands/title_format.c | 2 | ||||
| -rw-r--r-- | sway/commands/unmark.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/sway/commands/border.c b/sway/commands/border.c index cc0d635a..2eed27bd 100644 --- a/sway/commands/border.c +++ b/sway/commands/border.c @@ -59,7 +59,7 @@ struct cmd_results *cmd_border(int argc, char **argv) { } struct sway_container *container = config->handler_context.container; - if (!container->view) { + if (!container || !container->view) { return cmd_results_new(CMD_INVALID, "border", "Only views can have borders"); } diff --git a/sway/commands/mark.c b/sway/commands/mark.c index fb95a7d0..b1f47be1 100644 --- a/sway/commands/mark.c +++ b/sway/commands/mark.c @@ -19,7 +19,7 @@ struct cmd_results *cmd_mark(int argc, char **argv) { return error; } struct sway_container *container = config->handler_context.container; - if (!container->view) { + if (!container || !container->view) { return cmd_results_new(CMD_INVALID, "mark", "Only views can have marks"); } diff --git a/sway/commands/title_format.c b/sway/commands/title_format.c index c9ffe8fa..ef1c8935 100644 --- a/sway/commands/title_format.c +++ b/sway/commands/title_format.c @@ -12,7 +12,7 @@ struct cmd_results *cmd_title_format(int argc, char **argv) { return error; } struct sway_container *container = config->handler_context.container; - if (!container->view) { + if (!container || !container->view) { return cmd_results_new(CMD_INVALID, "title_format", "Only views can have a title_format"); } diff --git a/sway/commands/unmark.c b/sway/commands/unmark.c index c6251dc8..c671ed4e 100644 --- a/sway/commands/unmark.c +++ b/sway/commands/unmark.c @@ -25,7 +25,7 @@ struct cmd_results *cmd_unmark(int argc, char **argv) { struct sway_view *view = NULL; if (config->handler_context.using_criteria) { struct sway_container *container = config->handler_context.container; - if (!container->view) { + if (!container || !container->view) { return cmd_results_new(CMD_INVALID, "unmark", "Only views can have marks"); } |