diff options
| author | Drew DeVault <[email protected]> | 2018-10-08 14:42:48 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2018-10-08 14:42:48 +0200 |
| commit | 6cb0e58c6d26efa2bca9b3710df08ed1aea09aea (patch) | |
| tree | 1036293744616474f190d30f7ae5428579e82900 /sway/commands/bar.c | |
| parent | b3b17280de54021657eabf2df4c3dbfd0039bac8 (diff) | |
| parent | 5e1983660dddc40d60026cbd0daf96d880f24fb9 (diff) | |
Merge pull request #2791 from RyanDwyer/status-command-optional
swaybar: allow null status_command
Diffstat (limited to 'sway/commands/bar.c')
| -rw-r--r-- | sway/commands/bar.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sway/commands/bar.c b/sway/commands/bar.c index f760888e..03f4c557 100644 --- a/sway/commands/bar.c +++ b/sway/commands/bar.c @@ -46,14 +46,14 @@ struct cmd_results *cmd_bar(int argc, char **argv) { return error; } - if (!config->reading) { - if (!find_handler(argv[0], bar_config_handlers, - sizeof(bar_config_handlers))) { - return cmd_results_new(CMD_FAILURE, "bar", - "Can only be used in config file."); + if (find_handler(argv[0], bar_config_handlers, + sizeof(bar_config_handlers))) { + if (config->reading) { + return config_subcommand(argv, argc, bar_config_handlers, + sizeof(bar_config_handlers)); } - return config_subcommand(argv, argc, bar_config_handlers, - sizeof(bar_config_handlers)); + return cmd_results_new(CMD_FAILURE, "bar", + "Can only be used in config file."); } if (argc > 1) { |