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

Fix missing clips erased from timeline on opening project

parent b5272824
Pipeline #11666 passed with stage
in 14 minutes and 24 seconds
......@@ -641,7 +641,7 @@ void ClipController::checkAudioVideo()
{
QReadLocker lock(&m_producerLock);
m_masterProducer->seek(0);
if (m_masterProducer->get_int("_placeholder") == 1 || m_masterProducer->get("text") == QLatin1String("INVALID")) {
if (m_masterProducer->get_int("_placeholder") == 1 || m_masterProducer->get_int("_missingsource") == 1 || m_masterProducer->get("text") == QLatin1String("INVALID")) {
// This is a placeholder file, try to guess from its properties
QString orig_service = m_masterProducer->get("kdenlive:orig_service");
if (orig_service.startsWith(QStringLiteral("avformat")) || (m_masterProducer->get_int("audio_index") + m_masterProducer->get_int("video_index") > 0)) {
......
......@@ -555,7 +555,7 @@ bool TimelineModel::requestClipMove(int clipId, int trackId, int position, bool
}
} else if (getTrackById_const(trackId)->trackType() != m_allClips[clipId]->clipState()) {
// Move not allowed (audio / video mismatch)
qDebug() << "// CLIP MISMATC FOR TK: "<<trackId<< ", " << getTrackById_const(trackId)->trackType() << " == " << m_allClips[clipId]->clipState();
//qDebug() << "// CLIP MISMATC FOR TK: "<<trackId<< ", " << getTrackById_const(trackId)->trackType() << " == " << m_allClips[clipId]->clipState();
return false;
}
std::function<bool(void)> local_undo = []() { return true; };
......@@ -1399,7 +1399,7 @@ bool TimelineModel::requestGroupMove(int itemId, int groupId, int delta_track, i
std::unordered_set<int> all_compositions;
int lowerTrack = -1;
int upperTrack = -1;
// Separate clips from compositions to sort and check source tracks
for (int affectedItemId : all_items) {
if (delta_track != 0) {
......
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