projects
/
monky
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
cba36f2
)
Fix reloading config without X11
author
Nikolas Garofil
<garo@dunaldi.garofil.be>
Sat, 18 Jul 2009 08:49:16 +0000
(10:49 +0200)
committer
Nikolas Garofil
<garo@dunaldi.garofil.be>
Sat, 18 Jul 2009 08:49:16 +0000
(10:49 +0200)
src/conky.c
patch
|
blob
|
history
diff --git
a/src/conky.c
b/src/conky.c
index
8f47d29
..
f82b522
100644
(file)
--- a/
src/conky.c
+++ b/
src/conky.c
@@
-7463,6
+7463,7
@@
void clean_up(void *memtofree1, void* memtofree2)
x_initialised = NO;
}else{
free(fonts); //in set_default_configurations a font is set but not loaded
+ font_count = -1;
}
#endif /* X11 */
@@
-7952,7
+7953,7
@@
static void load_config_file(const char *f)
CONF2("out_to_x") {
/* don't listen if X is already initialised or
* if we already know we don't want it */
- if(x_initialised == NO) {
+ if(x_initialised != YES) {
if (string_to_bool(value)) {
output_methods &= TO_X;
} else {