Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-12-27 20:44:56 +00:00
Code Issues Releases Activity

Fix Lua window table segfault.

Browse Source
This commit is contained in:
Brenden Matthews 2009-07-12 21:38:35 -06:00
parent d3f1e6288c
commit ee64345f7c
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/llua.c
View File

@ -426,13 +426,13 @@ void llua_set_userdata(const char *key, const char *type, void *value)
void llua_setup_window_table(int text_start_x, int text_start_y, int text_width, int text_height) void llua_setup_window_table(int text_start_x, int text_start_y, int text_width, int text_height)
{ {
if (!lua_L) return;
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);
@ -450,7 +450,8 @@ 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 if (!lua_L) return;
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 */