From 2ff89f429bddd601c439e1a85716cba0cd959971 Mon Sep 17 00:00:00 2001
From: Andrei Dabija <andreid@gameanalytics.com>
Date: Tue, 9 Jun 2026 16:06:43 +0300
Subject: [PATCH] fix threading issue

---
 source/gameanalytics/GAState.cpp | 2 ++
 source/gameanalytics/GAState.h   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/source/gameanalytics/GAState.cpp b/source/gameanalytics/GAState.cpp
index bbd0851..f1e8d8d 100644
--- a/source/gameanalytics/GAState.cpp
+++ b/source/gameanalytics/GAState.cpp
@@ -39,6 +39,8 @@ namespace gameanalytics
 
         GAState::~GAState()
         {
+            _gaLogger.customLogHandler.reset();
+
             _gaThread.queueBlock(
                 [this]()
                 {
diff --git a/source/gameanalytics/GAState.h b/source/gameanalytics/GAState.h
index 28d84fa..0be43dd 100644
--- a/source/gameanalytics/GAState.h
+++ b/source/gameanalytics/GAState.h
@@ -220,12 +220,12 @@ namespace gameanalytics
 
             void buildRemoteConfigsJsons(const json& remoteCfgs);
             
-            threading::GAThreading  _gaThread;
             events::GAEvents        _gaEvents;
             device::GADevice        _gaDevice;
             logging::GALogger       _gaLogger;
             store::GAStore          _gaStore;
             http::GAHTTPApi         _gaHttp;
+            threading::GAThreading  _gaThread;
 
             std::string _customUserId;
             std::string _identifier;