From 64f9e4fc12c8a8b3283a4b2534d0c6c083b38ec4 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Mardelle Date: Tue, 4 Sep 2012 22:03:42 +0200 Subject: [PATCH] Fix possible crash on invalid clip: http://kdenlive.org/mantis/view.php?id=2714 --- src/clipitem.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/clipitem.cpp b/src/clipitem.cpp index ba8cb455..e3d78049 100644 --- a/src/clipitem.cpp +++ b/src/clipitem.cpp @@ -1060,7 +1060,8 @@ void ClipItem::resetFrameWidth(int width) QList ClipItem::snapMarkers() const { QList < GenTime > snaps; - QList < GenTime > markers = baseClip()->snapMarkers(); + if (!m_clip) return snaps; + QList < GenTime > markers = m_clip->snapMarkers(); GenTime pos; for (int i = 0; i < markers.size(); i++) { @@ -1076,7 +1077,8 @@ QList ClipItem::snapMarkers() const QList ClipItem::commentedSnapMarkers() const { QList < CommentedTime > snaps; - QList < CommentedTime > markers = baseClip()->commentedSnapMarkers(); + if (!m_clip) return snaps; + QList < CommentedTime > markers = m_clip->commentedSnapMarkers(); GenTime pos; for (int i = 0; i < markers.size(); i++) { @@ -1652,8 +1654,8 @@ void ClipItem::setSpeed(const double speed, const int strobe) if (m_speed <= 0 && m_speed > -1) m_speed = -1.0; m_strobe = strobe; - if (m_speed == 1.0) m_clipName = baseClip()->name(); - else m_clipName = baseClip()->name() + " - " + QString::number(speed * 100, 'f', 0) + '%'; + if (m_speed == 1.0) m_clipName = m_clip->name(); + else m_clipName = m_clip->name() + " - " + QString::number(speed * 100, 'f', 0) + '%'; m_info.cropStart = GenTime((int)(m_speedIndependantInfo.cropStart.frames(m_fps) / qAbs(m_speed) + 0.5), m_fps); m_info.cropDuration = GenTime((int)(m_speedIndependantInfo.cropDuration.frames(m_fps) / qAbs(m_speed) + 0.5), m_fps); //update(); -- 2.39.2