Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-17 18:45:10 +00:00
Code Issues Releases Activity

Ugly workaround for segfaults when build with x11 and lua

Browse Source
This commit is contained in:
Nikolas Garofil 2009-07-12 12:28:22 +02:00
parent 9e6fb9c2fe
commit dc4087fcff
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/llua.c
View File

@ -428,9 +428,11 @@ void llua_setup_window_table(int text_start_x, int text_start_y, int text_width,
{ {
lua_newtable(lua_L); lua_newtable(lua_L);
/* TODO fix this: (segfaults)
llua_set_userdata("drawable", "Drawable", (void*)&window.drawable); llua_set_userdata("drawable", "Drawable", (void*)&window.drawable);
llua_set_userdata("visual", "Visual", window.visual); llua_set_userdata("visual", "Visual", window.visual);
llua_set_userdata("display", "Display", display); llua_set_userdata("display", "Display", display);
*/
llua_set_long("width", window.width); llua_set_long("width", window.width);
llua_set_long("height", window.height); llua_set_long("height", window.height);
@ -448,6 +450,7 @@ void llua_setup_window_table(int text_start_x, int text_start_y, int text_width,
void llua_update_window_table(int text_start_x, int text_start_y, int text_width, int text_height) void llua_update_window_table(int text_start_x, int text_start_y, int text_width, int text_height)
{ {
llua_init(); //needed because sometimes lua isn't initialised resulting in segfaults
lua_getglobal(lua_L, "conky_window"); lua_getglobal(lua_L, "conky_window");
if (lua_isnil(lua_L, -1)) { if (lua_isnil(lua_L, -1)) {
/* window table isn't populated yet */ /* window table isn't populated yet */