TheHomecraft/cc-mek-scada
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#220 close ui on crash

Browse Source
This commit is contained in:
Mikayla Fischler 2023-04-20 21:19:16 -04:00
parent 4c8723eb32
commit 419ca2e6ef
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
install_manifest.json
View File

File diff suppressed because one or more lines are too long

9
reactor-plc/startup.lua
View File

@ -18,7 +18,7 @@ local plc = require("reactor-plc.plc")
local renderer = require("reactor-plc.renderer") local renderer = require("reactor-plc.renderer")
local threads = require("reactor-plc.threads") local threads = require("reactor-plc.threads")
local R_PLC_VERSION = "v1.1.13" local R_PLC_VERSION = "v1.1.14"
local println = util.println local println = util.println
local println_ts = util.println_ts local println_ts = util.println_ts
@ -264,4 +264,9 @@ local function main()
log.info("exited") log.info("exited")
end end
if not xpcall(main, crash.handler) then crash.exit() else log.close() end if not xpcall(main, crash.handler) then
pcall(renderer.close_ui)
crash.exit()
else
log.close()
end

9
rtu/startup.lua
View File

@ -28,7 +28,7 @@ local sna_rtu = require("rtu.dev.sna_rtu")
local sps_rtu = require("rtu.dev.sps_rtu") local sps_rtu = require("rtu.dev.sps_rtu")
local turbinev_rtu = require("rtu.dev.turbinev_rtu") local turbinev_rtu = require("rtu.dev.turbinev_rtu")
local RTU_VERSION = "v1.0.1" local RTU_VERSION = "v1.0.2"
local RTU_UNIT_TYPE = types.RTU_UNIT_TYPE local RTU_UNIT_TYPE = types.RTU_UNIT_TYPE
local RTU_UNIT_HW_STATE = databus.RTU_UNIT_HW_STATE local RTU_UNIT_HW_STATE = databus.RTU_UNIT_HW_STATE
@ -497,4 +497,9 @@ local function main()
log.info("exited") log.info("exited")
end end
if not xpcall(main, crash.handler) then crash.exit() else log.close() end if not xpcall(main, crash.handler) then
pcall(renderer.close_ui)
crash.exit()
else
log.close()
end