From 52262d562f9bf8b7fd8cb34817c3486a37fbedd4 Mon Sep 17 00:00:00 2001
From: Mateusz Daniluk <121170681+VeithMetro@users.noreply.github.com>
Date: Wed, 2 Jul 2025 14:20:49 +0200
Subject: [PATCH 1/2] Make sure that the Cleanups vector won't get destroyed
 before the Observer

---
 MessageControl/MessageControl.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MessageControl/MessageControl.h b/MessageControl/MessageControl.h
index 053275bc..2e33ad44 100644
--- a/MessageControl/MessageControl.h
+++ b/MessageControl/MessageControl.h
@@ -464,6 +464,7 @@ namespace Plugin {
         OutputList _outputDirector;
         Publishers::WebSocketOutput _webSocketExporter;
         MessageControl::ICollect::ICallback* _callback;
+        Cleanups _cleaning;
         Core::SinkType<Observer> _observer;
         PluginHost::IShell* _service;
         const string _dispatcherIdentifier;
@@ -475,7 +476,6 @@ namespace Plugin {
         Messaging::TraceFactoryType<Core::Messaging::IStore::WarningReporting, Core::Messaging::TextMessage> _warningReportingFactory;
         Messaging::TraceFactoryType<Core::Messaging::IStore::OperationalStream, Core::Messaging::TextMessage> _operationalStreamFactory;
         Messaging::TraceFactoryType<Core::Messaging::IStore::Assert, Core::Messaging::TextMessage> _assertFactory;
-        Cleanups _cleaning;
     };
 
 } // namespace Plugin

From 1833c3ee2df7eccdc400124bf44ba17f6fe877b1 Mon Sep 17 00:00:00 2001
From: Mateusz Daniluk <121170681+VeithMetro@users.noreply.github.com>
Date: Wed, 2 Jul 2025 14:21:33 +0200
Subject: [PATCH 2/2] Add the Cleanups vector to the constructor for
 consistency

---
 MessageControl/MessageControl.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/MessageControl/MessageControl.cpp b/MessageControl/MessageControl.cpp
index 3dd9d2df..00dac377 100644
--- a/MessageControl/MessageControl.cpp
+++ b/MessageControl/MessageControl.cpp
@@ -68,6 +68,7 @@ namespace Thunder {
         , _outputDirector()
         , _webSocketExporter()
         , _callback(nullptr)
+        , _cleaning()
         , _observer(*this)
         , _service(nullptr)
         , _dispatcherIdentifier(Messaging::MessageUnit::Instance().Identifier())