2 files changed, 6 insertions, 2 deletions
diff --git a/instr-daemon.c b/instr-daemon.c
index 62d24d8..be905ff 100644
--- a/instr-daemon.c
+++ b/instr-daemon.c
@@ -323,11 +323,12 @@ static gboolean finish_boot (void)
 
 	I2C_Setup_Monitor();
 
-	Show_Main_Menu();
-
 	// FIXME - self-cal here - or in thread beside user sessions?
 
 	globals.Sys.startup_complete = 1;
+
+	Show_Main_Menu();
+
 	return FALSE;	// no more calls to this function are needed
 }
 
diff --git a/menus.c b/menus.c
index bcb9134..f50481a 100644
--- a/menus.c
+++ b/menus.c
@@ -259,6 +259,9 @@ void Update_Main_Menu_If_Visible(void)
 
 void Show_Main_Menu(void)
 {
+
+	if (!globals.Sys.startup_complete) return;
+
 	GStaticMutex mutex = G_STATIC_MUTEX_INIT;
 	g_static_mutex_lock (&mutex);	// can be triggered simultaneously by local or remote users