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

List:       kde-commits
Subject:    [kdenlive/Applications/16.12] src: Fix crash when searching for missing clips,
From:       Jean-Baptiste Mardelle <jb () kdenlive ! org>
Date:       2016-12-05 7:32:48
Message-ID: E1cDnlY-00047A-Ra () code ! kde ! org
[Download RAW message or body]

Git commit d7e2372daa82f69b06d17546800a2e7f3a26a24c by Jean-Baptiste Mardelle.
Committed on 05/12/2016 at 07:32.
Pushed by mardelle into branch 'Applications/16.12'.

Fix crash when searching for missing clips, correctly look for missing playlists and \
clear effectstack when transition is unselected

M  +2    -2    src/doc/documentchecker.cpp
M  +4    -1    src/timeline/customtrackview.cpp

https://commits.kde.org/kdenlive/d7e2372daa82f69b06d17546800a2e7f3a26a24c

diff --git a/src/doc/documentchecker.cpp b/src/doc/documentchecker.cpp
index b4602b213..290564a1e 100644
--- a/src/doc/documentchecker.cpp
+++ b/src/doc/documentchecker.cpp
@@ -124,7 +124,7 @@ bool DocumentChecker::hasErrorInClips()
     max = documentProducers.count();
     QStringList verifiedPaths;
     QStringList serviceToCheck;
-    serviceToCheck << QStringLiteral("kdenlivetitle") << QStringLiteral("qimage") << \
QStringLiteral("pixbuf") << QStringLiteral("timewarp") << \
QStringLiteral("framebuffer"); +    serviceToCheck << QStringLiteral("kdenlivetitle") \
<< QStringLiteral("qimage") << QStringLiteral("pixbuf") << QStringLiteral("timewarp") \
<< QStringLiteral("framebuffer") << QStringLiteral("xml");  for (int i = 0; i < max; \
++i) {  e = documentProducers.item(i).toElement();
 	QString service = EffectsList::property(e, QStringLiteral("mlt_service"));
@@ -523,7 +523,7 @@ void DocumentChecker::slotSearchClips()
     int ix = 0;
     bool fixed = false;
     m_ui.recursiveSearch->setChecked(true);
-    qApp->processEvents();
+    //TODO: make non modal
     QTreeWidgetItem *child = m_ui.treeWidget->topLevelItem(ix);
     QDir searchDir(newpath);
     while (child) {
diff --git a/src/timeline/customtrackview.cpp b/src/timeline/customtrackview.cpp
index 4f6619934..2cba623cf 100644
--- a/src/timeline/customtrackview.cpp
+++ b/src/timeline/customtrackview.cpp
@@ -7676,7 +7676,10 @@ void CustomTrackView::clearSelection(bool emitInfo)
     scene()->clearSelection();
     if (m_dragItem) m_dragItem->setMainSelectedClip(false);
     m_dragItem = NULL;
-    if (emitInfo) emit clipItemSelected(NULL);
+    if (emitInfo) {
+        emit clipItemSelected(NULL);
+        emit transitionItemSelected(NULL);
+    }
 }
 
 void CustomTrackView::updatePalette()


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