colin/uosc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: nil error in show-menu api (#156)

Browse Source 
The local `menu` shadowed the global `menu`, thus accesing it's methods
didn't work.
This commit is contained in:
christoph-heinrich
2022-08-31 17:24:56 +02:00
committed by GitHub
parent ad2123744b
commit 1585bc30aa
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
scripts/uosc.lua
View File

@@ -3532,9 +3532,9 @@ mp.register_script_message('get-version', function(script)
mp.commandv('script-message-to', script, 'uosc-version', state.version)
end)
mp.register_script_message('show-menu', function(json)
local menu = utils.parse_json(json)
local menu_config = utils.parse_json(json)
if type(menu) ~= 'table' or type(menu.items) ~= 'table' then
if type(menu_config) ~= 'table' or type(menu_config.items) ~= 'table' then
msg.error('show-menu: received json didn\'t produce a table with menu configuration')
return
end
@@ -3547,16 +3547,16 @@ mp.register_script_message('show-menu', function(json)
end
end
if menu.type ~= nil and menu:is_open(menu.type) then
if menu_config.type ~= nil and menu:is_open(menu_config.type) then
menu:close()
return
end
Menu:open(menu.items, run_command, {
type = menu.type,
title = menu.title,
selected_index = menu.selected_index or menu.active_index or (#menu.items > 0 and 1 or nil),
active_index = menu.active_index,
Menu:open(menu_config.items, run_command, {
type = menu_config.type,
title = menu_config.title,
selected_index = menu_config.selected_index or menu_config.active_index or (#menu_config.items > 0 and 1 or nil),
active_index = menu_config.active_index,
})
end)
mp.register_script_message('show-submenu', function(name)