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 | ad2a7c26180dcb1ab0d2d128e207921152762ed6 (diff) | |
| parent | 38675eba7be471a2dacb5928f54d046297c23517 (diff) | |
| download | sway-e24fc3df18182f3b78cdf90322b0acabfb82a60e.tar.xz | |
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) { return error; } - if (!load_include_configs(argv[0], config)) { - return cmd_results_new(CMD_INVALID, "include", "Failed to include sub configuration file: %s", argv[0]); + if (!load_include_configs(argv[0], config, + &config->swaynag_config_errors)) { + return cmd_results_new(CMD_INVALID, "include", + "Failed to include sub configuration file: %s", argv[0]); } return cmd_results_new(CMD_SUCCESS, NULL, NULL); |