From 7597887e60b1b5f327b0769b29899110445438f9 Mon Sep 17 00:00:00 2001
From: Automatic Release Builder <build@flightgear.org>
Date: Mon, 5 Oct 2020 14:24:43 +0100
Subject: [PATCH] Fix Sentry issue: FGCom crash on exit

FGCom was added to the wrong group, leading it to be shutdown after
FGSoundManager, and hence, after OpenAL wad closed, which causes
crashes.

Sentry-Id: FLIGHTGEAR-66
---
 src/Main/fg_init.cxx | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Main/fg_init.cxx b/src/Main/fg_init.cxx
index 7eb6846d5..2178a5ed7 100644
--- a/src/Main/fg_init.cxx
+++ b/src/Main/fg_init.cxx
@@ -1100,8 +1100,13 @@ void fgCreateSubsystems(bool duringReset) {
 #ifdef ENABLE_IAX
     ////////////////////////////////////////////////////////////////////
     // Initialize the FGCom subsystem.
+    // very important this goes in the SOUND group, since IAXClient
+    // depends on OpenAL, which is shutdown when the SOUND group
+    // shutdown.
+    // Sentry: FLIGHTGEAR-66
+
     ////////////////////////////////////////////////////////////////////
-    globals->add_subsystem("fgcom", new FGCom);
+    globals->add_new_subsystem<FGCom>(SGSubsystemMgr::SOUND);
 #endif
 
     {