finished merge of viewer and footage

This commit is contained in:
itsmattkc
2021-04-06 13:08:56 +10:00
parent 57ddae8920
commit 898ea25e89
58 changed files with 783 additions and 719 deletions
+3 -9
View File
@@ -341,15 +341,9 @@ void MainWindow::ProjectClose(Project *p)
}
// Close any open footage in footage viewer
QVector<Footage*> footage_in_project = p->root()->ListChildrenOfType<Footage>();
QVector<Footage*> footage_in_viewer = footage_viewer_panel_->GetSelectedFootage();
if (!footage_in_viewer.isEmpty()) {
// FootageViewer only has the one footage item, check if it's in the project in which case
// we'll close it
if (footage_in_project.contains(footage_in_viewer.first())) {
footage_viewer_panel_->SetFootage(nullptr);
}
if (footage_viewer_panel_->GetConnectedViewer()
&& footage_viewer_panel_->GetConnectedViewer()->project() == p) {
footage_viewer_panel_->DisconnectViewerNode();
}
// Close any extra folder panels