aboutsummaryrefslogtreecommitdiff
path: root/sway/commands/kill.c
diff options
context:
space:
mode:
Diffstat (limited to 'sway/commands/kill.c')
-rw-r--r--sway/commands/kill.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/sway/commands/kill.c b/sway/commands/kill.c
index cebf7f3c..4b3666be 100644
--- a/sway/commands/kill.c
+++ b/sway/commands/kill.c
@@ -10,11 +10,16 @@ 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 (config->handler_context.current_container == NULL) {
+ wlr_log(L_DEBUG, "no container to kill");
+ return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+ }
enum swayc_types type = config->handler_context.current_container->type;
- if (type != C_VIEW || type != C_CONTAINER) {
+ if (type != C_VIEW && type != C_CONTAINER) {
return cmd_results_new(CMD_INVALID, NULL,
"Can only kill views and containers with this command");
}
+
// TODO close arbitrary containers without a view
struct sway_view *view =
config->handler_context.current_container->sway_view;