awesomewm-mirrors
/
awesome
mirror of https://github.com/awesomeWM/awesome.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix a "table expected instead of nil" error 

It seems like with lots of bad luck, the garbage collector manages to "steal"
the table with the buttons right after we decided to use it. Evil collector!

Signed-off-by: Uli Schlachter <psychon@znc.in>
This commit is contained in:
Uli Schlachter 2010-09-16 19:02:15 +02:00
parent 74b5cddbac
commit 222fb4c9c5
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/awful/widget/common.lua.in
View File

@ -51,8 +51,12 @@ function list_update(w, buttons, label, data, widgets, objects)
for k = 1, #objects * 2, 2 do for k = 1, #objects * 2, 2 do
local o = objects[(k + 1) / 2] local o = objects[(k + 1) / 2]
if buttons then if buttons then
if not data[o] then -- Use a local variable so that the garbage collector doesn't strike
data[o] = { } -- between now and the :buttons() call.
local btns = data[o]
if not btns then
btns = {}
data[o] = btns
for kb, b in ipairs(buttons) do for kb, b in ipairs(buttons) do
-- Create a proxy button object: it will receive the real -- Create a proxy button object: it will receive the real
-- press and release events, and will propagate them the the -- press and release events, and will propagate them the the
@ -61,11 +65,11 @@ function list_update(w, buttons, label, data, widgets, objects)
local btn = capi.button { modifiers = b.modifiers, button = b.button } local btn = capi.button { modifiers = b.modifiers, button = b.button }
btn:add_signal("press", function () b:emit_signal("press", o) end) btn:add_signal("press", function () b:emit_signal("press", o) end)
btn:add_signal("release", function () b:emit_signal("release", o) end) btn:add_signal("release", function () b:emit_signal("release", o) end)
data[o][#data[o] + 1] = btn btns[#btns + 1] = btn
end end
end end
w[k]:buttons(data[o]) w[k]:buttons(btns)
w[k + 1]:buttons(data[o]) w[k + 1]:buttons(btns)
end end
local text, bg, bg_image, icon = label(o) local text, bg, bg_image, icon = label(o)