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/reload.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/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 | } |