Fix a few minor bugs

1 files changed, 3 insertions, 1 deletions

diff --git a/fw.lua b/fw.lua
index f15d082..039d45a 100644
--- a/fw.lua
+++ b/fw.lua
@@ -253,7 +253,7 @@ if event.type == "digiline" and string.sub(event.channel,1,8) == "preempt_" and
 end
 
 --Phase logic for already-running cycles
-if mem.busy and event.type == "interrupt" and (event.iid == "tick" or event.iid == "manualtick") and not mem.phaselocked and (event.iid == "manualtick" or not mem.stoptime) then
+if mem.busy and mem.cycle and event.type == "interrupt" and (event.iid == "tick" or event.iid == "manualtick") and not mem.phaselocked and (event.iid == "manualtick" or not mem.stoptime) then
 	log("Continuing existing cycle at phase "..mem.cycle,true)
 	if mem.cycle == "preempt_yellow" then
 		for k,v in pairs(mem.currentphase) do
@@ -802,6 +802,8 @@ if event.type == "digiline" and event.channel == "touchscreen" then
 			interrupt(nil,"gapout")
 			interrupt(nil,"maxgreen")
 		end
+	elseif mem.menu == "reboot" then
+		--No fields/buttons on this screen, so do nothing
 	else
 		logfault("Unrecognized menu "..mem.menu,false)
 		mem.menu = "run"