Fix possible crash on clip deletion, fetch thumbs sequentially when adding several...

[kdenlive] / src / customtrackview.cpp

diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp
index 97b14501b8b17d40c0160db5c67b15cea8e54911..c76b8a599ac9783ef9e809e75080970da269409f 100644 (file)
--- a/src/customtrackview.cpp
+++ b/src/customtrackview.cpp
@@ -140,11 +140,16 @@ CustomTrackView::CustomTrackView(KdenliveDoc *doc, CustomTrackScene* projectscen
     connect(&m_scrollTimer, SIGNAL(timeout()), this, SLOT(slotCheckMouseScrolling()));
     m_scrollTimer.setInterval(100);
     m_scrollTimer.setSingleShot(true);
+
+    connect(&m_thumbsTimer, SIGNAL(timeout()), this, SLOT(slotFetchNextThumbs()));
+    m_thumbsTimer.setInterval(500);
+    m_thumbsTimer.setSingleShot(true);
 }
 
 CustomTrackView::~CustomTrackView()
 {
     qDeleteAll(m_guides);
+    m_waitingThumbs.clear();
 }
 
 void CustomTrackView::setDocumentModified()
@@ -258,6 +263,18 @@ int CustomTrackView::getPreviousVideoTrack(int track)
 }
 
 
+void CustomTrackView::slotFetchNextThumbs()
+{
+    if (!m_waitingThumbs.isEmpty()) {
+        ClipItem *item = m_waitingThumbs.takeFirst();
+        while ((item == NULL) && !m_waitingThumbs.isEmpty()) {
+            item = m_waitingThumbs.takeFirst();
+        }
+        if (item) item->slotFetchThumbs();
+        if (!m_waitingThumbs.isEmpty()) m_thumbsTimer.start();
+    }
+}
+
 void CustomTrackView::slotCheckMouseScrolling()
 {
     if (m_scrollOffset == 0) {
@@ -1158,17 +1175,20 @@ void CustomTrackView::dragEnterEvent(QDragEnterEvent * event)
             info.startPos = start;
             info.endPos = info.startPos + clip->duration();
             info.track = (int)(1 / m_tracksHeight);
-            ClipItem *item = new ClipItem(clip, info, m_document->fps(), 1.0);
+            ClipItem *item = new ClipItem(clip, info, m_document->fps(), 1.0, false);
             start += clip->duration();
             offsetList.append(start);
             m_selectionGroup->addToGroup(item);
             item->setFlags(QGraphicsItem::ItemIsSelectable);
+            m_waitingThumbs.append(item);
         }
         //TODO: check if we do not overlap another clip when first dropping in timeline
         //if (insertPossible(m_selectionGroup, event->pos()))
         updateSnapPoints(NULL, offsetList);
         scene()->addItem(m_selectionGroup);
+        m_thumbsTimer.start();
         event->acceptProposedAction();
+
     } else {
         // the drag is not a clip (may be effect, ...)
         m_clipDrag = false;
@@ -1697,6 +1717,8 @@ void CustomTrackView::dragMoveEvent(QDragMoveEvent * event)
 void CustomTrackView::dragLeaveEvent(QDragLeaveEvent * event)
 {
     if (m_selectionGroup && m_clipDrag) {
+        m_thumbsTimer.stop();
+        m_waitingThumbs.clear();
         QList<QGraphicsItem *> items = m_selectionGroup->childItems();
         qDeleteAll(items);
         scene()->destroyItemGroup(m_selectionGroup);
@@ -2731,8 +2753,10 @@ void CustomTrackView::deleteClip(ItemInfo info)
         }
     }*/
     scene()->removeItem(item);
+    m_waitingThumbs.removeAll(item);
     if (m_dragItem == item) m_dragItem = NULL;
     delete item;
+    item = NULL;
     m_document->setModified(true);
     m_document->renderer()->doRefresh();
 }