aboutsummaryrefslogtreecommitdiffstats
path: root/sway/config.c
diff options
context:
space:
mode:
authorLibravatar emersion <contact@emersion.fr>2018-10-08 15:08:33 +0200
committerLibravatar emersion <contact@emersion.fr>2018-10-08 15:08:33 +0200
commitc988b03d85e4c747194a682a40ab1b1e309a2fbe (patch)
treed790dee3ea65f825f16e89453196c74c4512583b /sway/config.c
parentMerge pull request #2791 from RyanDwyer/status-command-optional (diff)
downloadsway-c988b03d85e4c747194a682a40ab1b1e309a2fbe.tar.gz
sway-c988b03d85e4c747194a682a40ab1b1e309a2fbe.tar.zst
sway-c988b03d85e4c747194a682a40ab1b1e309a2fbe.zip
Allow swaybg to be disabled
Same as #2791 but for swaybg. Fixes #2790
Diffstat (limited to 'sway/config.c')
-rw-r--r--sway/config.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/sway/config.c b/sway/config.c
index 8f8ed438..7f29347a 100644
--- a/sway/config.c
+++ b/sway/config.c
@@ -136,6 +136,7 @@ void free_config(struct sway_config *config) {
136 free(config->floating_scroll_left_cmd); 136 free(config->floating_scroll_left_cmd);
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((char *)config->current_config_path); 140 free((char *)config->current_config_path);
140 free((char *)config->current_config); 141 free((char *)config->current_config);
141 free(config); 142 free(config);
@@ -240,6 +241,8 @@ static void config_defaults(struct sway_config *config) {
240 241
241 if (!(config->active_bar_modifiers = create_list())) goto cleanup; 242 if (!(config->active_bar_modifiers = create_list())) goto cleanup;
242 243
244 if (!(config->swaybg_command = strdup("swaybg"))) goto cleanup;
245
243 if (!(config->config_chain = create_list())) goto cleanup; 246 if (!(config->config_chain = create_list())) goto cleanup;
244 config->current_config_path = NULL; 247 config->current_config_path = NULL;
245 config->current_config = NULL; 248 config->current_config = NULL;