diff options
| author | emersion <contact@emersion.fr> | 2018-02-24 23:29:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-24 23:29:08 +0100 |
| commit | 583c30dbe3e3249ec1b753fddbfa982db56dce31 (patch) | |
| tree | ce07d65ab79287280f1f5468e2e62eb5cbef4089 /sway/commands/kill.c | |
| parent | b28602aa7425cf435150e6008624429737e037d3 (diff) | |
| parent | 1cca3965f395f624f698cc162946c6cbd6b10673 (diff) | |
| download | sway-583c30dbe3e3249ec1b753fddbfa982db56dce31.tar.xz | |
Merge pull request #1585 from acrisci/focus-overhaul
focus overhaul
Diffstat (limited to 'sway/commands/kill.c')
| -rw-r--r-- | sway/commands/kill.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sway/commands/kill.c b/sway/commands/kill.c index cebf7f3c..f408ce2a 100644 --- a/sway/commands/kill.c +++ b/sway/commands/kill.c @@ -6,15 +6,12 @@ #include "sway/commands.h" struct cmd_results *cmd_kill(int argc, char **argv) { - if (config->reading) { - return cmd_results_new(CMD_FAILURE, "kill", - "Command 'kill' cannot be used in the config file"); - } 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; |