aboutsummaryrefslogtreecommitdiff
path: root/spaghetti-monster/fsm-main.c
diff options
context:
space:
mode:
authorSelene ToyKeeper2018-08-22 23:47:46 -0600
committerSelene ToyKeeper2018-08-22 23:47:46 -0600
commite417f82a1f4cb5e738cd1cf71c81ab73d84b1902 (patch)
tree750f9763d723a443fcb008f5fa925e309ab1e33e /spaghetti-monster/fsm-main.c
parentmerged from trunk (diff)
parentmerged in zeroflow's fixes and my related changes: (diff)
downloadanduril-e417f82a1f4cb5e738cd1cf71c81ab73d84b1902.tar.gz
anduril-e417f82a1f4cb5e738cd1cf71c81ab73d84b1902.tar.bz2
anduril-e417f82a1f4cb5e738cd1cf71c81ab73d84b1902.zip
merged trunk, including zeroflow's fixes and my related changes
Diffstat (limited to 'spaghetti-monster/fsm-main.c')
-rw-r--r--spaghetti-monster/fsm-main.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/spaghetti-monster/fsm-main.c b/spaghetti-monster/fsm-main.c
index b0b44fb..6f74e9b 100644
--- a/spaghetti-monster/fsm-main.c
+++ b/spaghetti-monster/fsm-main.c
@@ -132,6 +132,8 @@ int main() {
// give the recipe some time slices
loop();
+ // in case we fell through, turn delays back on
+ nice_delay_interrupt = 0;
}
}