diff options
author | Drew DeVault <sir@cmpwn.com> | 2018-08-03 15:08:38 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-03 15:08:38 -0400 |
commit | 38675eba7be471a2dacb5928f54d046297c23517 (patch) | |
tree | 7982d1f38fcb3620372c1c8461de1450063e5355 /sway/commands/reload.c | |
parent | Merge pull request #2417 from marienz/swaynag-includes (diff) | |
parent | Remove swaynag_clone and use memcpy (diff) | |
download | sway-38675eba7be471a2dacb5928f54d046297c23517.tar.gz sway-38675eba7be471a2dacb5928f54d046297c23517.tar.zst sway-38675eba7be471a2dacb5928f54d046297c23517.zip |
Merge pull request #2400 from RedSoxFan/swaynag-config-errors
Show swaynag on config errors
Diffstat (limited to 'sway/commands/reload.c')
-rw-r--r-- | sway/commands/reload.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sway/commands/reload.c b/sway/commands/reload.c index 5c1b19b4..f8ca374d 100644 --- a/sway/commands/reload.c +++ b/sway/commands/reload.c | |||
@@ -19,8 +19,9 @@ struct cmd_results *cmd_reload(int argc, char **argv) { | |||
19 | list_add(bar_ids, strdup(bar->id)); | 19 | list_add(bar_ids, strdup(bar->id)); |
20 | } | 20 | } |
21 | 21 | ||
22 | if (!load_main_config(config->current_config_path, true)) { | 22 | if (!load_main_config(config->current_config_path, true, false)) { |
23 | return cmd_results_new(CMD_FAILURE, "reload", "Error(s) reloading config."); | 23 | return cmd_results_new(CMD_FAILURE, "reload", |
24 | "Error(s) reloading config."); | ||
24 | } | 25 | } |
25 | ipc_event_workspace(NULL, NULL, "reload"); | 26 | ipc_event_workspace(NULL, NULL, "reload"); |
26 | 27 | ||
@@ -42,5 +43,6 @@ struct cmd_results *cmd_reload(int argc, char **argv) { | |||
42 | list_free(bar_ids); | 43 | list_free(bar_ids); |
43 | 44 | ||
44 | arrange_windows(&root_container); | 45 | arrange_windows(&root_container); |
46 | |||
45 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 47 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); |
46 | } | 48 | } |