Commit 12e46dd4 authored by Jean-Baptiste Mardelle's avatar Jean-Baptiste Mardelle
Browse files

Fix tests hanging if avfilter is missing on CI system (avfilter.fieldorder...

Fix tests hanging if avfilter is missing on CI system (avfilter.fieldorder popped up a missing filter dialog)
parent 517b7e6f
Pipeline #243483 failed with stage
in 4 minutes and 51 seconds
......@@ -279,8 +279,9 @@ bool DocumentChecker::hasErrorInClips()
}
}
}
if (m_missingClips.isEmpty() && missingLumas.isEmpty() && m_missingProxies.isEmpty() && m_missingSources.isEmpty() && m_missingFonts.isEmpty() &&
m_missingFilters.isEmpty() && m_changedClips.isEmpty()) {
// Abort here if our MainWindow is not built (it means we are doing tests and don't want a dialog to pop up
if (pCore->window() == nullptr || (m_missingClips.isEmpty() && missingLumas.isEmpty() && m_missingProxies.isEmpty() && m_missingSources.isEmpty() &&
m_missingFonts.isEmpty() && m_missingFilters.isEmpty() && m_changedClips.isEmpty())) {
return false;
}
......
......@@ -5773,7 +5773,7 @@ void TimelineModel::updateFieldOrderFilter(std::unique_ptr<ProfileModel> &ptr)
if (filterService == QLatin1String("avfilter.fieldorder")) {
foundCount++;
if ((ptr->progressive() || foundCount > 1) && fl->get_int("internal_added") == 237) {
// If the profile is progressiv, field order is redundant: remove
// If the profile is progressive, field order is redundant: remove
// Also we only need one field order filter
m_tractor->detach(*fl.get());
pCore->currentDoc()->setModified(true);
......
Supports Markdown
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