#580 modem list fix
This commit is contained in:
parent
22208e91aa
commit
452fe71ab8
@ -732,11 +732,8 @@ function system.create(tool_ctl, main_pane, cfg_sys, divs, ext, style)
|
|||||||
local missing = { tmp = true, ini = true }
|
local missing = { tmp = true, ini = true }
|
||||||
|
|
||||||
for iface, _ in pairs(modems) do
|
for iface, _ in pairs(modems) do
|
||||||
if ini_cfg.WiredModem == iface then
|
if ini_cfg.WiredModem == iface then missing.ini = false end
|
||||||
missing.ini = false
|
if tmp_cfg.WiredModem == iface then missing.tmp = false end
|
||||||
elseif tmp_cfg.WiredModem == iface then
|
|
||||||
missing.tmp = false
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
if missing.tmp and tmp_cfg.WiredModem then
|
if missing.tmp and tmp_cfg.WiredModem then
|
||||||
|
|||||||
@ -324,9 +324,9 @@ function configurator.configure(ask_config)
|
|||||||
tool_ctl.has_config = load_settings(ini_cfg)
|
tool_ctl.has_config = load_settings(ini_cfg)
|
||||||
|
|
||||||
-- set tmp_cfg so interface lists are correct
|
-- set tmp_cfg so interface lists are correct
|
||||||
|
tmp_cfg.WiredModem = ini_cfg.WiredModem
|
||||||
tmp_cfg.Peripherals = tool_ctl.deep_copy_peri(ini_cfg.Peripherals)
|
tmp_cfg.Peripherals = tool_ctl.deep_copy_peri(ini_cfg.Peripherals)
|
||||||
tmp_cfg.Redstone = tool_ctl.deep_copy_rs(ini_cfg.Redstone)
|
tmp_cfg.Redstone = tool_ctl.deep_copy_rs(ini_cfg.Redstone)
|
||||||
tmp_cfg.WiredModem = ini_cfg.WiredModem
|
|
||||||
|
|
||||||
reset_term()
|
reset_term()
|
||||||
|
|
||||||
|
|||||||
@ -886,11 +886,8 @@ function system.create(tool_ctl, main_pane, cfg_sys, divs, fac_pane, style, exit
|
|||||||
local missing = { tmp = true, ini = true }
|
local missing = { tmp = true, ini = true }
|
||||||
|
|
||||||
for iface, _ in pairs(modems) do
|
for iface, _ in pairs(modems) do
|
||||||
if ini_cfg.WiredModem == iface then
|
if ini_cfg.WiredModem == iface then missing.ini = false end
|
||||||
missing.ini = false
|
if tmp_cfg.WiredModem == iface then missing.tmp = false end
|
||||||
elseif tmp_cfg.WiredModem == iface then
|
|
||||||
missing.tmp = false
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
if missing.tmp and tmp_cfg.WiredModem then
|
if missing.tmp and tmp_cfg.WiredModem then
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user