diff options
author | 2018-10-08 16:24:46 +0200 | |
---|---|---|
committer | 2018-10-08 16:24:46 +0200 | |
commit | 16e727a6541d3e44c60b116c4278b6bb9f51e3c6 (patch) | |
tree | 9f657329f7775cd764b60326a419d369eae8a605 /sway/config.c | |
parent | Merge pull request #2793 from emersion/disable-swaybg (diff) | |
parent | Allow swaynag to be disabled (diff) | |
download | sway-16e727a6541d3e44c60b116c4278b6bb9f51e3c6.tar.gz sway-16e727a6541d3e44c60b116c4278b6bb9f51e3c6.tar.zst sway-16e727a6541d3e44c60b116c4278b6bb9f51e3c6.zip |
Merge pull request #2795 from RedSoxFan/swaynag-disable
Allow swaynag to be disabled
Diffstat (limited to 'sway/config.c')
-rw-r--r-- | sway/config.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sway/config.c b/sway/config.c index 7f29347a..e95c7b35 100644 --- a/sway/config.c +++ b/sway/config.c | |||
@@ -137,6 +137,7 @@ void free_config(struct sway_config *config) { | |||
137 | free(config->floating_scroll_right_cmd); | 137 | free(config->floating_scroll_right_cmd); |
138 | free(config->font); | 138 | free(config->font); |
139 | free(config->swaybg_command); | 139 | free(config->swaybg_command); |
140 | free(config->swaynag_command); | ||
140 | free((char *)config->current_config_path); | 141 | free((char *)config->current_config_path); |
141 | free((char *)config->current_config); | 142 | free((char *)config->current_config); |
142 | free(config); | 143 | free(config); |
@@ -167,7 +168,7 @@ static void set_color(float dest[static 4], uint32_t color) { | |||
167 | } | 168 | } |
168 | 169 | ||
169 | static void config_defaults(struct sway_config *config) { | 170 | static void config_defaults(struct sway_config *config) { |
170 | config->swaynag_command = strdup("swaynag"); | 171 | if (!(config->swaynag_command = strdup("swaynag"))) goto cleanup; |
171 | config->swaynag_config_errors = (struct swaynag_instance){ | 172 | config->swaynag_config_errors = (struct swaynag_instance){ |
172 | .args = "--type error " | 173 | .args = "--type error " |
173 | "--message 'There are errors in your config file' " | 174 | "--message 'There are errors in your config file' " |