Aire-One
/
awesome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tasklist/taglist: Handle invalid text better 

When some client sets an invalid window title, a lua error was generated while
updating the tasklist. This caused all later tasklist entries to be skipped /
missing and the last entry to be empty.

Fix this by catching lua errors with pcall.

Signed-off-by: Uli Schlachter <psychon@znc.in>
This commit is contained in:
Uli Schlachter 2011-03-18 17:28:38 +01:00
parent b6baca5857
commit e59f17357d
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,6 +9,7 @@ local math = math
local type = type local type = type
local ipairs = ipairs local ipairs = ipairs
local pairs = pairs local pairs = pairs
local pcall = pcall
local setmetatable = setmetatable local setmetatable = setmetatable
local capi = { button = button } local capi = { button = button }
local util = require("awful.util") local util = require("awful.util")
@ -86,7 +87,10 @@ function common.list_update(w, buttons, label, data, objects)
end end
local text, bg, bg_image, icon = label(o) local text, bg, bg_image, icon = label(o)
tb:set_markup(text) -- The text might be invalid, so use pcall
if not pcall(tb.set_markup, tb, text) then
tb:set_markup("<i>&lt;Invalid text&gt;</i>")
end
bgb:set_bg(bg) bgb:set_bg(bg)
bgb:set_bgimage(bg_image) bgb:set_bgimage(bg_image)
ib:set_image(icon) ib:set_image(icon)