Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-19 00:41:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
This ensures the thread has finished prior to returning from Stop().
This commit is contained in:
Peter Johnson
2023-11-10 21:03:30 -08:00
committed by GitHub
parent b6f2d3cc14
commit 95fa5ec72f
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ntcoreffi/src/main/native/cpp/DataLogManager.cpp
View File

@@ -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) {

2
wpilibc/src/main/native/cpp/DataLogManager.cpp
View File

@@ -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) {