Merge branch 'master' of grenfell.avtechpulse.com:Instrument

Conflicts:
	instr-daemon.c

1 files changed, 2 insertions, 0 deletions

diff --git a/globals.h b/globals.h
index 13b6cc9..9e008dc 100644
--- a/globals.h
+++ b/globals.h
@@ -771,6 +771,8 @@ typedef struct {
 	int do_check_settings;
 	int flash_writes_suspended;
 	int force_output_fully_off;
+	int shutdown_started;
+	int flash_write_in_progress;
 } FlagStruct;