Skip to content

Commit 6722b38

Browse files
author
arch
committed
improve lua script
1 parent faf647d commit 6722b38

File tree

1 file changed

+14
-7
lines changed

1 file changed

+14
-7
lines changed

contrib/Installer/assets/main.lua

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ tmpFileName = "funscript_actions.json"
1414
tmpFileExists = false
1515
enableLogs = false
1616
scriptNames = {}
17+
scriptNamesCount = 0
1718
scriptAssignment = {x={idx=1}, y={idx=1}, roll={idx=1}}
1819

1920
function exists(file)
@@ -334,11 +335,14 @@ end
334335

335336
function update_script_names()
336337
local i = 1
338+
scriptNamesCount = 0
337339
scriptNames = {'ignore'}
340+
scriptNamesCount = scriptNamesCount + 1
338341
while ofs.Script(i) do
339-
name = ofs.ScriptTitle(i)
340-
if not is_empty(name) then
341-
table.insert(scriptNames, name)
342+
name = ofs.ScriptTitle(i)
343+
if not is_empty(name) then
344+
table.insert(scriptNames, name)
345+
scriptNamesCount = scriptNamesCount + 1
342346
end
343347
i = i + 1
344348
end
@@ -434,10 +438,13 @@ function gui()
434438
if multiaxis then
435439
local comboNum = 1
436440
for k,v in pairs(scriptAssignment) do
437-
ofs.Text(" o "..k.." ->")
438-
ofs.SameLine()
439-
v.idx, _ = ofs.Combo("#"..tostring(comboNum), v.idx, scriptNames)
440-
comboNum = comboNum + 1
441+
ofs.Text(" o "..k.." ->")
442+
ofs.SameLine()
443+
if v.idx > scriptNamesCount then
444+
v.idx = 1
445+
end
446+
v.idx, _ = ofs.Combo("#"..tostring(comboNum), v.idx, scriptNames)
447+
comboNum = comboNum + 1
441448
end
442449
end
443450

0 commit comments

Comments
 (0)