From 056a4f9129e600d7cd41dc6fdcbd35141baee65e Mon Sep 17 00:00:00 2001 From: Robert Date: Mon, 30 Sep 2019 11:18:39 +0200 Subject: [PATCH] Fix: Crash toggleswitch when args are empty (#5438) Fix: #5434 --- frontend/ui/widget/configdialog.lua | 2 +- frontend/ui/widget/toggleswitch.lua | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/frontend/ui/widget/configdialog.lua b/frontend/ui/widget/configdialog.lua index 9278bbb79..e4ba0c611 100644 --- a/frontend/ui/widget/configdialog.lua +++ b/frontend/ui/widget/configdialog.lua @@ -535,7 +535,7 @@ function ConfigOption:init() enabled = enabled, row_count = row_count, callback = function(arg) - if self.options[c].args[arg] == "⋮" then + if self.options[c].toggle[arg] == "⋮" then self.config:onConfigMoreChoose(self.options[c].values, self.options[c].name, self.options[c].event, arg, self.options[c].name_text, self.options[c].delay_repaint, self.options[c].more_options_param) end diff --git a/frontend/ui/widget/toggleswitch.lua b/frontend/ui/widget/toggleswitch.lua index 0cf59f197..6ef241b73 100644 --- a/frontend/ui/widget/toggleswitch.lua +++ b/frontend/ui/widget/toggleswitch.lua @@ -195,7 +195,7 @@ function ToggleSwitch:onTapSelect(arg, gev) end if gev then local position = self:calculatePosition(gev) - if self.args[position] ~= "⋮" then + if self.toggle[position] ~= "⋮" then self:togglePosition(position, true) else self:togglePosition(position, false) @@ -218,7 +218,7 @@ function ToggleSwitch:onTapSelect(arg, gev) end --]] self.callback(self.position) - if self.args[self.position] ~= "⋮" then + if self.toggle[self.position] ~= "⋮" then self.config:onConfigChoose(self.values, self.name, self.event, self.args, self.events, self.position, self.delay_repaint) UIManager:setDirty(self.config, function() @@ -230,7 +230,7 @@ end function ToggleSwitch:onHoldSelect(arg, gev) local position = self:calculatePosition(gev) - if self.args[position] == "⋮" then + if self.toggle[position] == "⋮" then return true end if self.name == "font_fine_tune" then