From 9d775cdfe788cf9415ebe0a47f42b6542e798ebd Mon Sep 17 00:00:00 2001
From: Automatic Release Builder <build@flightgear.org>
Date: Sun, 23 Aug 2020 20:33:23 +0100
Subject: [PATCH] Fix duplicate init of Sentry on reset

---
 src/Main/fg_init.cxx | 2 --
 src/Main/main.cxx    | 3 +++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Main/fg_init.cxx b/src/Main/fg_init.cxx
index 4ab65955b..c5415da45 100644
--- a/src/Main/fg_init.cxx
+++ b/src/Main/fg_init.cxx
@@ -880,8 +880,6 @@ bool fgInitGeneral() {
 
     sgUserDataInit( globals->get_props() );
 
-    flightgear::delayedSentryInit();
-
     return true;
 }
 
diff --git a/src/Main/main.cxx b/src/Main/main.cxx
index 5078e1357..48e4a5e73 100755
--- a/src/Main/main.cxx
+++ b/src/Main/main.cxx
@@ -332,6 +332,9 @@ static void fgIdleFunction ( void ) {
             throw sg_exception("General initialization failed");
         }
 
+        // now we have commands up
+        flightgear::delayedSentryInit();
+
         ////////////////////////////////////////////////////////////////////
         // Initialize the property-based built-in commands
         ////////////////////////////////////////////////////////////////////