From 5e29414dce2773ca508c5de9ae6a311d6405c574 Mon Sep 17 00:00:00 2001
From: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date: Tue, 21 Feb 2023 19:44:26 -0800
Subject: [PATCH] clip: use footage label by default rather than copied label

---
 app/node/block/clip/clip.cpp              | 4 +++-
 app/widget/timelinewidget/tool/import.cpp | 1 -
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/node/block/clip/clip.cpp b/app/node/block/clip/clip.cpp
index 9424f2203..d30ec6ac2 100644
--- a/app/node/block/clip/clip.cpp
+++ b/app/node/block/clip/clip.cpp
@@ -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) {
diff --git a/app/widget/timelinewidget/tool/import.cpp b/app/widget/timelinewidget/tool/import.cpp
index ae42257da..bc6ff74e3 100644
--- a/app/widget/timelinewidget/tool/import.cpp
+++ b/app/widget/timelinewidget/tool/import.cpp
@@ -424,7 +424,6 @@ void ImportTool::DropGhosts(bool insert, MultiUndoCommand *parent_command)
         ClipBlock* clip = new ClipBlock();
         block = clip;
         clip->set_media_in(ghost->GetMediaIn());
-        clip->SetLabel(footage_stream.footage->GetLabel());
         command->add_child(new NodeAddCommand(dst_graph, clip));
 
         // Position clip in its own context