aboutsummaryrefslogtreecommitdiff
path: root/sway/commands/kill.c
diff options
context:
space:
mode:
authorDrew DeVault <sir@cmpwn.com>2018-01-30 23:09:21 -0500
committerDrew DeVault <sir@cmpwn.com>2018-01-30 23:09:21 -0500
commitb28602aa7425cf435150e6008624429737e037d3 (patch)
treedafe7d23c48457299f33803832f6b89e09a915ce /sway/commands/kill.c
parent8231f99c12b059bf762c2ca77258a520b3a6886f (diff)
Implement workspaces
Diffstat (limited to 'sway/commands/kill.c')
-rw-r--r--sway/commands/kill.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/sway/commands/kill.c b/sway/commands/kill.c
index 3804f0b0..cebf7f3c 100644
--- a/sway/commands/kill.c
+++ b/sway/commands/kill.c
@@ -10,11 +10,10 @@ struct cmd_results *cmd_kill(int argc, char **argv) {
return cmd_results_new(CMD_FAILURE, "kill",
"Command 'kill' cannot be used in the config file");
}
- if (!sway_assert(config->handler_context.current_container,
- "cmd_kill called without container context")) {
+ enum swayc_types type = config->handler_context.current_container->type;
+ if (type != C_VIEW || type != C_CONTAINER) {
return cmd_results_new(CMD_INVALID, NULL,
- "cmd_kill called without container context "
- "(this is a bug in sway)");
+ "Can only kill views and containers with this command");
}
// TODO close arbitrary containers without a view
struct sway_view *view =