From kde-commits  Sat Jan 31 22:10:20 2015
From: Jean-Baptiste Mardelle <jb () kdenlive ! org>
Date: Sat, 31 Jan 2015 22:10:20 +0000
To: kde-commits
Subject: [kdenlive/frameworks] src/mltcontroller: Fix crash on slideshow right click in bin
Message-Id: <E1YHgFA-0003zm-Px () scm ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=142274223025749

Git commit 67e34ebce52402ec94513669c815f0c227577f14 by Jean-Baptiste Mardel=
le.
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/clipc=
ontroller.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!=3D AV && m_clipType !=3D Video && m_=
clipType !=3D Audio)) return QString();
     QString propertyName =3D QString("meta.media.%1.codec.name").arg(audio=
Codec ? m_audioIndex : m_videoIndex);
     return m_properties->get(propertyName.toUtf8().constData());
 }