From 67bbcceba1433e41b5edfca32532b7d55a39a395 Mon Sep 17 00:00:00 2001 From: Mikkel Oscar Lyderik Date: Wed, 24 Feb 2016 18:53:09 +0100 Subject: Free config before exiting sway. Apart from freeing the sway_config struct, this also terminates the swaybars spawned by sway, since they are linked by PID to the bar config structs. --- include/config.h | 4 ++++ sway/config.c | 2 +- sway/main.c | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/include/config.h b/include/config.h index 8907e019..d77872ee 100644 --- a/include/config.h +++ b/include/config.h @@ -192,6 +192,10 @@ bool load_config(const char *file); /** Reads the config from the given FILE. */ bool read_config(FILE *file, bool is_active); +/** + * Free config struct + */ +void free_config(struct sway_config *config); /** * Does variable replacement for a string based on the config's currently loaded variables. */ diff --git a/sway/config.c b/sway/config.c index 16adaf0d..296e164c 100644 --- a/sway/config.c +++ b/sway/config.c @@ -86,7 +86,7 @@ static void free_workspace_output(struct workspace_output *wo) { free(wo); } -static void free_config(struct sway_config *config) { +void free_config(struct sway_config *config) { int i; for (i = 0; i < config->symbols->length; ++i) { free_variable(config->symbols->items[i]); diff --git a/sway/main.c b/sway/main.c index 7ea392b6..7c712281 100644 --- a/sway/main.c +++ b/sway/main.c @@ -228,6 +228,10 @@ int main(int argc, char **argv) { ipc_terminate(); + if (config) { + free_config(config); + } + return exit_value; } -- cgit v1.2.3-54-g00ecf