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

Fix potential deadlock, maybe related to #1380

parent a61a8f94
...@@ -1156,11 +1156,14 @@ QPoint ProjectClip::zone() const ...@@ -1156,11 +1156,14 @@ QPoint ProjectClip::zone() const
const QString ProjectClip::hash(bool createIfEmpty) const QString ProjectClip::hash(bool createIfEmpty)
{ {
if (m_clipStatus == FileStatus::StatusWaiting) {
return QString();
}
QString clipHash = getProducerProperty(QStringLiteral("kdenlive:file_hash")); QString clipHash = getProducerProperty(QStringLiteral("kdenlive:file_hash"));
if (!clipHash.isEmpty()) { if (!clipHash.isEmpty() || createIfEmpty) {
return clipHash; return clipHash;
} }
return createIfEmpty ? getFileHash() : QString(); return getFileHash();
} }
const QByteArray ProjectClip::getFolderHash(const QDir &dir, QString fileName) const QByteArray ProjectClip::getFolderHash(const QDir &dir, QString fileName)
......
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