Commit 34da6a7b authored by Jean-Baptiste Mardelle's avatar Jean-Baptiste Mardelle
Browse files

Fix defects

parent d29a962a
Pipeline #148577 passed with stage
in 11 minutes and 5 seconds
......@@ -2599,7 +2599,7 @@ void MainWindow::slotDeleteClipMarker(bool allowGuideDeletion)
}
bool markerFound = false;
CommentedTime marker = clip->getMarkerModel()->getMarker(pos, &markerFound);
clip->getMarkerModel()->getMarker(pos, &markerFound);
if (!markerFound) {
if (allowGuideDeletion && m_projectMonitor->isActive()) {
slotDeleteGuide();
......@@ -2648,7 +2648,7 @@ void MainWindow::slotEditClipMarker()
}
bool markerFound = false;
CommentedTime oldMarker = clip->getMarkerModel()->getMarker(pos, &markerFound);
clip->getMarkerModel()->getMarker(pos, &markerFound);
if (!markerFound) {
m_messageLabel->setMessage(i18n("No marker found at cursor time"), ErrorMessage);
return;
......@@ -2959,7 +2959,6 @@ void MainWindow::slotAddTransition(QAction *result)
void MainWindow::slotAddEffect(QAction *result)
{
qDebug() << "// EFFECTS MENU TRIGGERED: " << result->data().toString();
if (!result) {
return;
}
......
......@@ -1340,13 +1340,7 @@ bool ClipModel::checkConsistency()
}
std::shared_ptr<ProjectClip> binClip = pCore->projectItemModel()->getClipByBinID(m_binClipId);
auto instances = binClip->timelineInstances();
bool found = false;
for (const auto &i : qAsConst(instances)) {
if (i == m_id) {
found = true;
break;
}
}
bool found = instances.contains(m_id);
if (!found) {
qDebug() << "ERROR: binClip doesn't acknowledge timeline clip existence";
return false;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment