Skip to content

Commit

Permalink
Fix warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
notomo committed Nov 5, 2024
1 parent 88f09cb commit 1d68fbf
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 8 deletions.
5 changes: 3 additions & 2 deletions lua/piemenu/core/menu.lua
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,9 @@ function Menus.parse(name, raw_setting)
end
end

local setting, err = Setting.new(raw_setting)
if err then
local setting = Setting.new(raw_setting)
if type(setting) == "string" then
local err = setting
return err
end

Expand Down
6 changes: 3 additions & 3 deletions lua/piemenu/core/setting.lua
Original file line number Diff line number Diff line change
Expand Up @@ -34,18 +34,18 @@ function Setting.new(raw_setting)
animation = { data.animation, "table" },
})
if base_err then
return nil, base_err
return base_err
end

local anim_err = validatelib.validate({
["animation.duration"] = validatelib.not_negative(data.animation.duration),
})
if anim_err then
return nil, anim_err
return anim_err
end

local tbl = { _data = data }
return setmetatable(tbl, Setting), nil
return setmetatable(tbl, Setting)
end

function Setting.default_values()
Expand Down
7 changes: 4 additions & 3 deletions lua/piemenu/view/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,10 @@ function View.open(name, raw_setting)
return err
end

local setting, merge_err = menus.setting:merge(raw_setting)
if merge_err then
return merge_err
local setting = menus.setting:merge(raw_setting)
if type(setting) == "string" then
local err = setting
return err
end

local view_setting = setting:for_view()
Expand Down

0 comments on commit 1d68fbf

Please sign in to comment.