alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Free config before exiting sway.

Browse source 
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.
This commit is contained in:
Mikkel Oscar Lyderik 2016-02-24 18:53:09 +01:00
parent e15a8a0376
commit 67bbcceba1
3 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/config.h
View file

@ -192,6 +192,10 @@ bool load_config(const char *file);
/** Reads the config from the given FILE. /** Reads the config from the given FILE.
*/ */
bool read_config(FILE *file, bool is_active); 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. * Does variable replacement for a string based on the config's currently loaded variables.
*/ */

2
sway/config.c
View file

@ -86,7 +86,7 @@ static void free_workspace_output(struct workspace_output *wo) {
free(wo); free(wo);
} }
static void free_config(struct sway_config *config) { void free_config(struct sway_config *config) {
int i; int i;
for (i = 0; i < config->symbols->length; ++i) { for (i = 0; i < config->symbols->length; ++i) {
free_variable(config->symbols->items[i]); free_variable(config->symbols->items[i]);

4
sway/main.c
View file

@ -228,6 +228,10 @@ int main(int argc, char **argv) {
ipc_terminate(); ipc_terminate();
if (config) {
free_config(config);
}
return exit_value; return exit_value;
} }