Minecraft/cc-mek-scada
1
0
Fork 0
mirror of https://github.com/MikaylaFischler/cc-mek-scada.git synced 2024-08-30 18:22:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

#460 exit on UI crash

Browse Source
This commit is contained in:
Mikayla Fischler 2024-04-07 20:55:07 -04:00
parent 45573be8c7
commit f734c4307b
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
coordinator/startup.lua
View File

@ -144,7 +144,7 @@ local function main()
---@class crd_state ---@class crd_state
crd_state = { crd_state = {
fp_ok = false, fp_ok = false,
ui_ok = false, ui_ok = true, -- default true, used to abort on fail
link_fail = false, link_fail = false,
shutdown = false shutdown = false
}, },

9
coordinator/threads.lua
View File

@ -190,16 +190,21 @@ function threads.thread__main(smem)
sounder.continue() sounder.continue()
end end
-- check for termination request -- check for termination request or UI crash
if event == "terminate" or ppm.should_terminate() then if event == "terminate" or ppm.should_terminate() then
crd_state.shutdown = true crd_state.shutdown = true
log.info("terminate requested, main thread exiting") log.info("terminate requested, main thread exiting")
elseif not crd_state.ui_ok then
crd_state.shutdown = true
log.info("terminating due to fatal UI error")
end
if crd_state.shutdown then
-- handle closing supervisor connection -- handle closing supervisor connection
coord_comms.try_connect(true) coord_comms.try_connect(true)
if coord_comms.is_linked() then if coord_comms.is_linked() then
log_comms("terminate requested, closing supervisor connection...") log_comms("closing supervisor connection...")
else crd_state.link_fail = true end else crd_state.link_fail = true end
coord_comms.close() coord_comms.close()