Merge branch 'master' into track-redux

2023-02-23 11:07:50 -08:00
parent 85a8fbf1fd 3bc53cef60
commit aeac292ecb
35 changed files with 346 additions and 114 deletions
@@ -69,7 +69,9 @@ ClipBlock::ClipBlock() :

 QString ClipBlock::Name() const
 {
-  if (track()) {
+  if (connected_viewer_ && !connected_viewer_->GetLabel().isEmpty()) {
+    return connected_viewer_->GetLabel();
+  } else if (track()) {
    if (track()->type() == Track::kVideo) {
      return tr("Video Clip");
    } else if (track()->type() == Track::kAudio) {