[wpilibc,ntcoreffi] DataLogManager: join on Stop() call (wpilibsuite#…

…5910) This ensures the thread has finished prior to returning from Stop().
srimanachanta · Nov 11, 2023 · 95fa5ec · 95fa5ec
1 parent b6f2d3c
commit 95fa5ec
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/ntcoreffi/src/main/native/cpp/DataLogManager.cpp b/ntcoreffi/src/main/native/cpp/DataLogManager.cpp
@@ -482,7 +482,7 @@ void DataLogManager::Start(std::string_view dir, std::string_view filename,
 void DataLogManager::Stop() {
   auto& inst = GetInstance();
   inst.owner.GetThread()->m_log.Stop();
-  inst.owner.Stop();
+  inst.owner.Join();
 }
 
 void DataLogManager::Log(std::string_view message) {

diff --git a/wpilibc/src/main/native/cpp/DataLogManager.cpp b/wpilibc/src/main/native/cpp/DataLogManager.cpp
@@ -328,7 +328,7 @@ void DataLogManager::Start(std::string_view dir, std::string_view filename,
 void DataLogManager::Stop() {
   auto& inst = GetInstance();
   inst.owner.GetThread()->m_log.Stop();
-  inst.owner.Stop();
+  inst.owner.Join();
 }
 
 void DataLogManager::Log(std::string_view message) {