From b2e7be925087e406fec58b16683993404d0f4262 Mon Sep 17 00:00:00 2001 From: Peter Johnson Date: Sat, 4 Nov 2023 18:40:52 -0700 Subject: [PATCH] [ntcore] Only datalog meta-topics if specifically requested (#5873) --- ntcore/src/main/native/cpp/LocalStorage.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ntcore/src/main/native/cpp/LocalStorage.cpp b/ntcore/src/main/native/cpp/LocalStorage.cpp index 0377f4ffc9..4591ff55b0 100644 --- a/ntcore/src/main/native/cpp/LocalStorage.cpp +++ b/ntcore/src/main/native/cpp/LocalStorage.cpp @@ -130,7 +130,7 @@ void LocalStorage::Impl::NotifyTopic(TopicData* topic, if (!m_dataloggers.empty()) { auto now = Now(); for (auto&& datalogger : m_dataloggers) { - if (wpi::starts_with(topic->name, datalogger->prefix)) { + if (PrefixMatch(topic->name, datalogger->prefix, topic->special)) { auto it = std::find_if(topic->datalogs.begin(), topic->datalogs.end(), [&](const auto& elem) { return elem.logger == datalogger->handle; @@ -1448,7 +1448,7 @@ NT_DataLogger LocalStorage::StartDataLog(wpi::log::DataLog& log, // start logging any matching topics auto now = nt::Now(); for (auto&& topic : m_impl.m_topics) { - if (!wpi::starts_with(topic->name, prefix) || + if (!PrefixMatch(topic->name, prefix, topic->special) || topic->type == NT_UNASSIGNED || topic->typeStr.empty()) { continue; }