summaryrefslogtreecommitdiffstats
path: root/sway/config
diff options
context:
space:
mode:
authorLibravatar Drew DeVault <sir@cmpwn.com>2019-02-03 09:55:54 +0100
committerLibravatar GitHub <noreply@github.com>2019-02-03 09:55:54 +0100
commitbbfe13a24893bac6a5c41ac39115288d1d6e025f (patch)
tree1770223ab5d8fb7242452ab7886fdb214ad1aacd /sway/config
parentMerge pull request #3554 from RedSoxFan/seat-current-alias (diff)
parentRevert "More frees." (diff)
downloadsway-bbfe13a24893bac6a5c41ac39115288d1d6e025f.tar.gz
sway-bbfe13a24893bac6a5c41ac39115288d1d6e025f.tar.zst
sway-bbfe13a24893bac6a5c41ac39115288d1d6e025f.zip
Merge pull request #3551 from c-edw/RevertDoubleFrees1.0-rc1
Revert double frees.
Diffstat (limited to 'sway/config')
-rw-r--r--sway/config/bar.c1
-rw-r--r--sway/config/output.c1
2 files changed, 0 insertions, 2 deletions
diff --git a/sway/config/bar.c b/sway/config/bar.c
index 2e28fa1e..bafef307 100644
--- a/sway/config/bar.c
+++ b/sway/config/bar.c
@@ -46,7 +46,6 @@ void free_bar_config(struct bar_config *bar) {
46 free(bar->position); 46 free(bar->position);
47 free(bar->hidden_state); 47 free(bar->hidden_state);
48 free(bar->status_command); 48 free(bar->status_command);
49 free(bar->swaybar_command);
50 free(bar->font); 49 free(bar->font);
51 free(bar->separator_symbol); 50 free(bar->separator_symbol);
52 for (int i = 0; i < bar->bindings->length; i++) { 51 for (int i = 0; i < bar->bindings->length; i++) {
diff --git a/sway/config/output.c b/sway/config/output.c
index cc5f29db..970764b0 100644
--- a/sway/config/output.c
+++ b/sway/config/output.c
@@ -402,6 +402,5 @@ void free_output_config(struct output_config *oc) {
402 free(oc->name); 402 free(oc->name);
403 free(oc->background); 403 free(oc->background);
404 free(oc->background_option); 404 free(oc->background_option);
405 free(oc->background_fallback);
406 free(oc); 405 free(oc);
407} 406}