Merge branch 'master' into track-redux

This commit is contained in:
itsmattkc
2023-02-23 11:07:50 -08:00
35 changed files with 346 additions and 114 deletions
@@ -329,6 +329,13 @@ ProjectSerializer220403::LoadData ProjectSerializer220403::Load(Project *project
}
}
}
// Clear duplicate label (to facilitate #2147)
if (ClipBlock *c = dynamic_cast<ClipBlock*>(n)) {
if (c->connected_viewer() && c->GetLabel() == c->connected_viewer()->GetLabel()) {
c->SetLabel(QString());
}
}
}
return load_data;