Skip to content
Snippets Groups Projects
Commit 5e31f65e authored by Nicolas Pope's avatar Nicolas Pope
Browse files

Fix new pause bug

parent 59350ddf
Branches
Tags
1 merge request!316Resolves #343 GUI and Frame Refactor
Pipeline #28082 failed
...@@ -80,6 +80,8 @@ void Camera::activate(ftl::data::FrameID id) { ...@@ -80,6 +80,8 @@ void Camera::activate(ftl::data::FrameID id) {
filter = io->feed()->filter(std::unordered_set<unsigned int>{id.frameset()}, {Channel::Left}); filter = io->feed()->filter(std::unordered_set<unsigned int>{id.frameset()}, {Channel::Left});
filter->on( filter->on(
[this,&cv,&m, speaker = io->speaker()](ftl::data::FrameSetPtr fs){ [this,&cv,&m, speaker = io->speaker()](ftl::data::FrameSetPtr fs){
if (paused) return true;
std::atomic_store(&current_fs_, fs); std::atomic_store(&current_fs_, fs);
// Need to notify GUI thread when first data comes // Need to notify GUI thread when first data comes
...@@ -89,7 +91,7 @@ void Camera::activate(ftl::data::FrameID id) { ...@@ -89,7 +91,7 @@ void Camera::activate(ftl::data::FrameID id) {
cv.notify_one(); cv.notify_one();
} }
if (paused || !view) { return true; } if (!view) return true;
// Deal with audio // Deal with audio
if (fs->frames[frame_idx].hasOwn(Channel::AudioStereo)) { if (fs->frames[frame_idx].hasOwn(Channel::AudioStereo)) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment