File fix-crash-with-mlt-6.8.0.patch of Package kdenlive

Overview Repositories Revisions Requests Users Attributes Meta

File fix-crash-with-mlt-6.8.0.patch of Package kdenlive (Revision ef3b9ecd0609d7caa04b62987d7d33c4)

Currently displaying revision ef3b9ecd0609d7caa04b62987d7d33c4 , Show latest

From 9b09dbb2b0de78d4eaf4011c8a462fdb3c6916b6 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Mardelle <jb@kdenlive.org>
Date: Mon, 21 May 2018 08:39:28 +0200
Subject: Fix crash with MLT 6.8.0 and some keyfameable parameters (box blur)

---
 src/timeline/keyframeview.cpp | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/timeline/keyframeview.cpp b/src/timeline/keyframeview.cpp
index 3196a0f..b882abe 100644
--- a/src/timeline/keyframeview.cpp
+++ b/src/timeline/keyframeview.cpp
@@ -599,7 +599,9 @@ void KeyframeView::updateKeyFramePos(const QRectF &br, int frame, const double y
             }
             // Remove kfr at previous position
             m_keyAnim = m_keyProperties.get_animation(paramName.toUtf8().constData());
-            m_keyAnim.remove(activeKeyframe);
+            if (m_keyAnim.is_valid()) {
+                m_keyAnim.remove(activeKeyframe);
+            }
         }
         m_keyAnim = m_keyProperties.get_animation(m_inTimeline.toUtf8().constData());
     }
@@ -718,7 +720,9 @@ void KeyframeView::removeKeyframe(int frame)
     paramNames.removeAll(m_inTimeline);
     foreach (const QString &paramName, paramNames) {
         m_keyAnim = m_keyProperties.get_animation(paramName.toUtf8().constData());
-        m_keyAnim.remove(frame);
+        if (m_keyAnim.is_valid()) {
+            m_keyAnim.remove(frame);
+        }
     }
     m_keyAnim = m_keyProperties.get_animation(m_inTimeline.toUtf8().constData());
 }
@@ -772,6 +776,9 @@ const QString KeyframeView::serialize(const QString &name, bool rectAnimation)
     if (!name.isEmpty()) {
         m_keyAnim = m_keyProperties.get_animation(name.toUtf8().constData());
     }
+    if (!m_keyAnim.is_valid()) {
+        return m_keyProperties.get(name.toUtf8().constData());
+    }
     if (attachToEnd == -2 || rectAnimation) {
         return m_keyAnim.serialize_cut();
     }
@@ -946,7 +953,7 @@ bool KeyframeView::loadKeyframes(const QLocale &locale, const QDomElement &effec
         }
         if (paramName == m_inTimeline) {
             m_keyAnim = m_keyProperties.get_animation(m_inTimeline.toUtf8().constData());
-            if (m_keyAnim.next_key(activeKeyframe) <= activeKeyframe) {
+            if (m_keyAnim.is_valid() && m_keyAnim.next_key(activeKeyframe) <= activeKeyframe) {
                 activeKeyframe = -1;
             }
         }
-- 
cgit v0.11.2

Places

File fix-crash-with-mlt-6.8.0.patch of Package kdenlive (Revision ef3b9ecd0609d7caa04b62987d7d33c4)

Places