Fixes crashes if parent is destroyed. Found by krazy. Details at:
http://blogs.kde.org/node/3919
---
src/mainwindow.cpp | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 78aa154..66ae06a 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -3330,11 +3330,12 @@ void MainWindow::slotApplyNewClipProperties(const
QString id, QMap <QString, QSt
void MainWindow::slotShowClipProperties(QList <DocClipBase *> cliplist,
QMap<QString, QString> commonproperties)
{
- ClipProperties dia(cliplist, m_activeDocument->timecode(),
commonproperties, this);
- if (dia.exec() == QDialog::Accepted) {
+ QPointer<ClipProperties> dia = new ClipProperties(cliplist,
+ m_activeDocument->timecode(), commonproperties, this);
+ if (dia->exec() == QDialog::Accepted) {
QUndoCommand *command = new QUndoCommand();
command->setText(i18n("Edit clips"));
- QMap <QString, QString> newImageProps = dia.properties();
+ QMap <QString, QString> newImageProps = dia->properties();
// Transparency setting applies only for images
QMap <QString, QString> newProps = newImageProps;
newProps.remove("transparency");
@@ -3348,8 +3349,9 @@ void MainWindow::slotShowClipProperties(QList
<DocClipBase *> cliplist, QMap<QSt
}
m_activeDocument->commandStack()->push(command);
for (int i = 0; i < cliplist.count(); i++)
-
m_activeTimeline->projectView()->slotUpdateClip(cliplist.at(i)->getId(),
dia.needsTimelineReload());
+
m_activeTimeline->projectView()->slotUpdateClip(cliplist.at(i)->getId(),
dia->needsTimelineReload());
}
+ delete dia;
}
void MainWindow::customEvent(QEvent* e)
--
1.7.10.4
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Kdenlive-devel mailing list
Kdenlive-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/kdenlive-devel
