From c7389666a193b120d0e2486c0b69fd0dbe014ad8 Mon Sep 17 00:00:00 2001
From: Nicolas Pope <nwpope@utu.fi>
Date: Fri, 14 Aug 2020 17:06:10 +0300
Subject: [PATCH] Ignore fsid 255
---
components/streams/src/stream.cpp | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/components/streams/src/stream.cpp b/components/streams/src/stream.cpp
index 8861d0a79..72a8524e9 100644
--- a/components/streams/src/stream.cpp
+++ b/components/streams/src/stream.cpp
@@ -45,12 +45,16 @@ const std::unordered_set<ftl::codecs::Channel> &Stream::selected(int fs) const {
}
std::unordered_set<ftl::codecs::Channel> Stream::selectedNoExcept(int fs) const {
+ if (fs == 255) return {};
+
SHARED_LOCK(mtx_, lk);
if (fs < 0 || static_cast<uint32_t>(fs) >= state_.size()) return {};
return state_[fs].selected;
}
void Stream::select(int fs, const std::unordered_set<ftl::codecs::Channel> &s, bool make) {
+ if (fs == 255) return;
+
UNIQUE_LOCK(mtx_, lk);
if (fs < 0 || (!make && static_cast<uint32_t>(fs) >= state_.size())) throw FTL_Error("Frameset index out-of-bounds: " << fs);
if (static_cast<uint32_t>(fs) >= state_.size()) state_.resize(fs+1);
--
GitLab