From 0dfdf63399142dd49e1f77fa20124a89447083d6 Mon Sep 17 00:00:00 2001
From: James Turner <zakalawe@mac.com>
Date: Thu, 29 Oct 2020 17:28:05 +0000
Subject: [PATCH] Clear atomic listeners too

This is part of trying to reduce possible causes of the property
crash on shutdown.
---
 src/Main/globals.cxx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Main/globals.cxx b/src/Main/globals.cxx
index fc9ea3e5d..552572a52 100644
--- a/src/Main/globals.cxx
+++ b/src/Main/globals.cxx
@@ -39,6 +39,7 @@
 #include <simgear/misc/ResourceManager.hxx>
 #include <simgear/props/propertyObject.hxx>
 #include <simgear/props/props_io.hxx>
+#include <simgear/props/AtomicChangeListener.hxx>
 #include <simgear/scene/model/modellib.hxx>
 #include <simgear/package/Root.hxx>
 
@@ -949,6 +950,8 @@ void FGGlobals::cleanupListeners()
         delete *i;
     }
     _listeners_to_cleanup.clear();
+
+    simgear::AtomicChangeListener::clearPendingChanges();
 }
 
 simgear::pkg::Root* FGGlobals::packageRoot()