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

List:       kde-commits
Subject:    [kdenlive/next] src: Fix crashes related to Qt objects created in different threads
From:       Vincent PINON <vincent.pinon () laposte ! net>
Date:       2014-04-30 20:27:58
Message-ID: E1Wfb6k-0003AX-01 () scm ! kde ! org
[Download RAW message or body]

Git commit 5d16dc9ab37165070867ae88d6388048aba7aeba by Vincent PINON, on be=
half of Jean-Baptiste Mardelle.
Committed on 03/04/2014 at 22:41.
Pushed by vpinon into branch 'next'.

Fix crashes related to Qt objects created in different threads

M  +2    -1    src/mainwindow.cpp

http://commits.kde.org/kdenlive/5d16dc9ab37165070867ae88d6388048aba7aeba

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 6a968bd..866ddfc 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -708,6 +708,7 @@ MainWindow::~MainWindow()
     delete m_activeDocument;
     delete m_projectMonitor;
     delete m_clipMonitor;
+    delete m_projectList;
     delete m_shortcutRemoveFocus;
     delete[] m_transitions;
     delete m_monitorManager;
@@ -949,7 +950,7 @@ void MainWindow::slotConnectMonitors()
     connect(m_projectMonitor->render, SIGNAL(replyGetImage(QString,QString=
,int,int)), m_projectList, SLOT(slotReplyGetImage(QString,QString,int,int))=
);
     connect(m_projectMonitor->render, SIGNAL(replyGetImage(QString,QImage)=
), m_projectList, SLOT(slotReplyGetImage(QString,QImage)));
 =

-    connect(m_projectMonitor->render, SIGNAL(replyGetFileProperties(QStrin=
g,Mlt::Producer*,stringMap,stringMap,bool)), m_projectList, SLOT(slotReplyG=
etFileProperties(QString,Mlt::Producer*,stringMap,stringMap,bool)), Qt::Dir=
ectConnection);
+    connect(m_projectMonitor->render, SIGNAL(replyGetFileProperties(QStrin=
g,Mlt::Producer*,stringMap,stringMap,bool)), m_projectList, SLOT(slotReplyG=
etFileProperties(QString,Mlt::Producer*,stringMap,stringMap,bool)));
 =

     connect(m_projectMonitor->render, SIGNAL(removeInvalidClip(QString,boo=
l)), m_projectList, SLOT(slotRemoveInvalidClip(QString,bool)));
 =


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