summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Baptiste Mardelle <jb@kdenlive.org>2016-12-05 07:32:30 (GMT)
committerJean-Baptiste Mardelle <jb@kdenlive.org>2016-12-05 07:32:30 (GMT)
commitd7e2372daa82f69b06d17546800a2e7f3a26a24c (patch)
tree8429163b2991062427e1843bc6749ed7c3f6206e
parentb753b3cfb55ce2eb3ad27a1c546d9b70fcd17265 (diff)
Fix crash when searching for missing clips, correctly look for missing playlists and clear effectstack when transition is unselected
-rw-r--r--src/doc/documentchecker.cpp4
-rw-r--r--src/timeline/customtrackview.cpp5
2 files changed, 6 insertions, 3 deletions
diff --git a/src/doc/documentchecker.cpp b/src/doc/documentchecker.cpp
index b4602b2..290564a 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 4f66199..2cba623 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()