diff options
| author | Ian Fan <ianfan0@gmail.com> | 2018-10-08 12:05:18 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-08 12:05:18 +0000 |
| commit | b3b17280de54021657eabf2df4c3dbfd0039bac8 (patch) | |
| tree | d2602caa071680a898a80f8096ed8f787103329e /sway/config.c | |
| parent | 89f4ebef064809c4e3d4cc08f8c7f08f4bc6d420 (diff) | |
| parent | e168e8f0ffbcd3924570aec63655c6ca0ab384fa (diff) | |
| download | sway-b3b17280de54021657eabf2df4c3dbfd0039bac8.tar.xz | |
Merge pull request #2789 from RyanDwyer/reload-idle
Reload config using idle event
Diffstat (limited to 'sway/config.c')
| -rw-r--r-- | sway/config.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sway/config.c b/sway/config.c index b56c4f71..8f8ed438 100644 --- a/sway/config.c +++ b/sway/config.c @@ -457,6 +457,12 @@ bool load_main_config(const char *file, bool is_active, bool validating) { success = success && load_config(path, config, &config->swaynag_config_errors); + if (validating) { + free_config(config); + config = old_config; + return success; + } + if (is_active) { for (int i = 0; i < config->output_configs->length; i++) { apply_output_config_to_outputs(config->output_configs->items[i]); |