[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdenlive/frameworks] src/mltcontroller: Fix crash on slideshow right click in bin
From:       Jean-Baptiste Mardelle <jb () kdenlive ! org>
Date:       2015-01-31 22:10:20
Message-ID: E1YHgFA-0003zm-Px () scm ! kde ! org
[Download RAW message or body]

Git commit 67e34ebce52402ec94513669c815f0c227577f14 by Jean-Baptiste Mardelle.
Committed on 31/01/2015 at 22:10.
Pushed by mardelle into branch 'frameworks'.

Fix crash on slideshow right click in bin

M  +1    -1    src/mltcontroller/clipcontroller.cpp

http://commits.kde.org/kdenlive/67e34ebce52402ec94513669c815f0c227577f14

diff --git a/src/mltcontroller/clipcontroller.cpp \
b/src/mltcontroller/clipcontroller.cpp index 9414660..38c2c80 100644
--- a/src/mltcontroller/clipcontroller.cpp
+++ b/src/mltcontroller/clipcontroller.cpp
@@ -276,7 +276,7 @@ double ClipController::originalFps() const
 
 const QString ClipController::codec(bool audioCodec) const
 {
-    if (!m_properties) return QString();
+    if (!m_properties || (m_clipType!= AV && m_clipType != Video && m_clipType != \
                Audio)) return QString();
     QString propertyName = QString("meta.media.%1.codec.name").arg(audioCodec ? \
m_audioIndex : m_videoIndex);  return \
m_properties->get(propertyName.toUtf8().constData());  }


[prev in list] [next in list] [prev in thread] [next in thread]