diff options
author | mwenzkowski <29407878+mwenzkowski@users.noreply.github.com> | 2018-11-04 20:40:14 +0100 |
---|---|---|
committer | mwenzkowski <29407878+mwenzkowski@users.noreply.github.com> | 2018-11-04 20:40:14 +0100 |
commit | 67866dc3785453ad0ac97d14858c9176cbcca966 (patch) | |
tree | 0067a93b11b4aed8962b38c4848b4c5cc6eddecc | |
parent | Correct manpage regarding gaps command (diff) | |
download | sway-67866dc3785453ad0ac97d14858c9176cbcca966.tar.gz sway-67866dc3785453ad0ac97d14858c9176cbcca966.tar.zst sway-67866dc3785453ad0ac97d14858c9176cbcca966.zip |
gaps: Improve error reporting
Always raise an error if the runtime only gaps command is found in the
config file.
-rw-r--r-- | sway/commands/gaps.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/sway/commands/gaps.c b/sway/commands/gaps.c index ca8cb27a..3f0ef155 100644 --- a/sway/commands/gaps.c +++ b/sway/commands/gaps.c | |||
@@ -149,16 +149,17 @@ struct cmd_results *cmd_gaps(int argc, char **argv) { | |||
149 | return error; | 149 | return error; |
150 | } | 150 | } |
151 | 151 | ||
152 | bool config_loading = !config->active || config->reloading; | ||
153 | |||
152 | if (argc == 2) { | 154 | if (argc == 2) { |
153 | return gaps_set_defaults(argc, argv); | 155 | return gaps_set_defaults(argc, argv); |
154 | } | 156 | } |
155 | if (argc == 4) { | 157 | if (argc == 4 && !config_loading) { |
156 | if (config->active) { | 158 | return gaps_set_runtime(argc, argv); |
157 | return gaps_set_runtime(argc, argv); | 159 | } |
158 | } else { | 160 | if (config_loading) { |
159 | return cmd_results_new(CMD_INVALID, "gaps", | 161 | return cmd_results_new(CMD_INVALID, "gaps", |
160 | "This syntax can only be used when sway is running"); | 162 | "Expected 'gaps inner|outer <px>'"); |
161 | } | ||
162 | } | 163 | } |
163 | return cmd_results_new(CMD_INVALID, "gaps", | 164 | return cmd_results_new(CMD_INVALID, "gaps", |
164 | "Expected 'gaps inner|outer <px>' or " | 165 | "Expected 'gaps inner|outer <px>' or " |