diff options
| author |  Ryan Dwyer <RyanDwyer@users.noreply.github.com> | 2018-08-04 10:15:29 +1000 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-08-04 10:15:29 +1000 |
| commit | e24fc3df18182f3b78cdf90322b0acabfb82a60e (patch) | |
| tree | 27a696a801539c946ac597e20b920c4b29697204 /sway/commands/include.c | |
| parent | Check correct ws for sticky and fix floating iter (diff) | |
| parent | Merge pull request #2400 from RedSoxFan/swaynag-config-errors (diff) | |
| download | sway-e24fc3df18182f3b78cdf90322b0acabfb82a60e.tar.gz sway-e24fc3df18182f3b78cdf90322b0acabfb82a60e.tar.zst sway-e24fc3df18182f3b78cdf90322b0acabfb82a60e.zip | |
Merge branch 'master' into fix-2416
Diffstat (limited to 'sway/commands/include.c')
| -rw-r--r-- | sway/commands/include.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sway/commands/include.c b/sway/commands/include.c index 1ba9a10d..61f383bb 100644 --- a/sway/commands/include.c +++ b/sway/commands/include.c | |||
| @@ -7,8 +7,10 @@ struct cmd_results *cmd_include(int argc, char **argv) { | |||
| 7 | return error; | 7 | return error; |
| 8 | } | 8 | } |
| 9 | 9 | ||
| 10 | if (!load_include_configs(argv[0], config)) { | 10 | if (!load_include_configs(argv[0], config, |
| 11 | return cmd_results_new(CMD_INVALID, "include", "Failed to include sub configuration file: %s", argv[0]); | 11 | &config->swaynag_config_errors)) { |
| 12 | return cmd_results_new(CMD_INVALID, "include", | ||
| 13 | "Failed to include sub configuration file: %s", argv[0]); | ||
| 12 | } | 14 | } |
| 13 | 15 | ||
| 14 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 16 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); |