0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix potential "image is nil" error in [message]

Browse source
This commit is contained in:
Celtic Minstrel 2016-04-04 20:55:45 -04:00
parent d3374d3670
commit a275f22ebe
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
data/lua/wml/message.lua
View file

@ -24,6 +24,10 @@ local function get_image(cfg, speaker)
image = speaker.portrait
end
if image == "none" or image == nil then
return "", true
end
if image:find("~RIGHT%(%)") then
left_side = false
-- The percent signs escape the parentheses for a literal match
@ -38,10 +42,6 @@ local function get_image(cfg, speaker)
image = image:gsub("~LEFT%(%)", "")
end
if image == "none" or image == nil then
return "", true
end
return image, left_side
end