diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-10-14 14:30:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-14 14:30:52 +0200 |
| commit | abde9d6627483256ccfd20bdeeaa52d7790b0426 (patch) | |
| tree | a851a6f4f6356470123d5d870c5d12fb9de78f73 /sway/commands/bar | |
| parent | dbb169bf1588b524bde8a2b7bfb83d5e2bb9b506 (diff) | |
| parent | 2a0c7ebd43a82197754586de32deb3cdbbfa3cd9 (diff) | |
| download | sway-abde9d6627483256ccfd20bdeeaa52d7790b0426.tar.xz | |
Merge pull request #2808 from RedSoxFan/bar-subcommands
Fix bar subcommand handler structs and selection
Diffstat (limited to 'sway/commands/bar')
| -rw-r--r-- | sway/commands/bar/id.c | 2 | ||||
| -rw-r--r-- | sway/commands/bar/status_command.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/sway/commands/bar/id.c b/sway/commands/bar/id.c index 65fa69fd..7690a852 100644 --- a/sway/commands/bar/id.c +++ b/sway/commands/bar/id.c @@ -13,6 +13,8 @@ struct cmd_results *bar_cmd_id(int argc, char **argv) { const char *oldname = config->current_bar->id; if (strcmp(name, oldname) == 0) { return cmd_results_new(CMD_SUCCESS, NULL, NULL); // NOP + } else if (strcmp(name, "id") == 0) { + return cmd_results_new(CMD_INVALID, "id", "id cannot be 'id'"); } // check if id is used by a previously defined bar for (int i = 0; i < config->bars->length; ++i) { diff --git a/sway/commands/bar/status_command.c b/sway/commands/bar/status_command.c index 5b4fdc87..490393f1 100644 --- a/sway/commands/bar/status_command.c +++ b/sway/commands/bar/status_command.c @@ -25,7 +25,7 @@ struct cmd_results *bar_cmd_status_command(int argc, char **argv) { } if (config->active && !config->validating) { - load_swaybars(); + load_swaybar(config->current_bar); } return cmd_results_new(CMD_SUCCESS, NULL, NULL); |