projects
/
monky
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git.omp.am:/home/omp/git/conky
[monky]
/
src
/
conky.c
diff --git
a/src/conky.c
b/src/conky.c
index
5830843
..
37e90ec
100644
(file)
--- a/
src/conky.c
+++ b/
src/conky.c
@@
-8072,6
+8072,7
@@
static void load_config_file(const char *f)
} else {
output_methods &= ~TO_X;
x_initialised = NEVER;
+ free(fonts); //in set_default_configurations a font is set
}
}
}