projects
/
monky
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix 'nvidia with ncurses segfaults' (sf.net #3006233)
[monky]
/
src
/
conky.c
diff --git
a/src/conky.c
b/src/conky.c
index
c8c55e7
..
3144172
100644
(file)
--- a/
src/conky.c
+++ b/
src/conky.c
@@
-2300,7
+2300,7
@@
void generate_text_internal(char *p, int p_max_size,
}
#ifdef NVIDIA
OBJ(nvidia) {
}
#ifdef NVIDIA
OBJ(nvidia) {
- print_nvidia_value(obj, display, p, p_max_size);
+ print_nvidia_value(obj, p, p_max_size);
}
#endif /* NVIDIA */
#ifdef APCUPSD
}
#endif /* NVIDIA */
#ifdef APCUPSD
@@
-4055,6
+4055,9
@@
void clean_up_without_threads(void *memtofree1, void* memtofree2) {
font_count = -1;
}
font_count = -1;
}
+#ifdef NVIDIA
+ set_nvidia_display(NULL);
+#endif
#endif /* X11 */
free_templates();
#endif /* X11 */
free_templates();
@@
-4602,6
+4605,12
@@
char load_config_file(const char *f)
disp = strdup(value);
}
}
disp = strdup(value);
}
}
+#ifdef NVIDIA
+ CONF("nvidia_display") {
+ if(value)
+ set_nvidia_display(value);
+ }
+#endif
CONF("alignment") {
setalignment(&text_alignment, window.type, value, f, line, 1);
}
CONF("alignment") {
setalignment(&text_alignment, window.type, value, f, line, 1);
}