From 681e66f34c25343617c8117b7a9b4ab613e68aaa Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Sun, 2 Oct 2022 12:02:50 -0700 Subject: [PATCH] multicam: ensure node is disconnected when closing --- app/widget/multicam/multicamwidget.cpp | 2 +- app/widget/viewer/viewer.cpp | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/widget/multicam/multicamwidget.cpp b/app/widget/multicam/multicamwidget.cpp index 16fa7e5c8..6afbd9ac8 100644 --- a/app/widget/multicam/multicamwidget.cpp +++ b/app/widget/multicam/multicamwidget.cpp @@ -66,7 +66,7 @@ void MulticamWidget::SetMulticamNodeInternal(ViewerOutput *viewer, MultiCamNode void MulticamWidget::SetMulticamNode(ViewerOutput *viewer, MultiCamNode *n, ClipBlock *clip, const rational &time) { - if (time == rational::NaN || time == GetTime()) { + if (time.isNaN() || time == GetTime()) { SetMulticamNodeInternal(viewer, n, clip); play_queue_.clear(); } else { diff --git a/app/widget/viewer/viewer.cpp b/app/widget/viewer/viewer.cpp index ef9d47390..1ec330c19 100644 --- a/app/widget/viewer/viewer.cpp +++ b/app/widget/viewer/viewer.cpp @@ -262,6 +262,9 @@ void ViewerWidget::DisconnectNodeEvent(ViewerOutput *n) timeline_selected_blocks_.clear(); node_view_selected_.clear(); + if (multicam_panel_) { + multicam_panel_->SetMulticamNode(nullptr, nullptr, nullptr, rational::NaN); + } CloseAudioProcessor(); audio_scrub_watchers_.clear();