Fixes crashes if parent is destroyed. Found by krazy. Details at:
http://blogs.kde.org/node/3919
---
src/customtrackview.cpp | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp
index 32d519a..858a9a1 100644
--- a/src/customtrackview.cpp
+++ b/src/customtrackview.cpp
@@ -1356,14 +1356,15 @@ void CustomTrackView::editItemDuration()
else
getClipAvailableSpace(item, minimum, maximum);
- ClipDurationDialog d(item, m_document->timecode(), minimum, maximum,
this);
- if (d.exec() == QDialog::Accepted) {
+ QPointer<ClipDurationDialog> d = new ClipDurationDialog(item,
+ m_document->timecode(), minimum, maximum, this);
+ if (d->exec() == QDialog::Accepted) {
ItemInfo clipInfo = item->info();
ItemInfo startInfo = clipInfo;
if (item->type() == TRANSITIONWIDGET) {
// move & resize transition
- clipInfo.startPos = d.startPos();
- clipInfo.endPos = clipInfo.startPos + d.duration();
+ clipInfo.startPos = d->startPos();
+ clipInfo.endPos = clipInfo.startPos + d->duration();
clipInfo.track = item->track();
MoveTransitionCommand *command = new
MoveTransitionCommand(this, startInfo, clipInfo, true);
updateTrackDuration(clipInfo.track, command);
@@ -1373,10 +1374,10 @@ void CustomTrackView::editItemDuration()
ClipItem *clip = static_cast<ClipItem *>(item);
QUndoCommand *moveCommand = new QUndoCommand();
moveCommand->setText(i18n("Edit clip"));
- if (d.duration() < item->cropDuration() || d.cropStart() !=
clipInfo.cropStart) {
+ if (d->duration() < item->cropDuration() || d->cropStart() !=
clipInfo.cropStart) {
// duration was reduced, so process it first
- clipInfo.endPos = clipInfo.startPos + d.duration();
- clipInfo.cropStart = d.cropStart();
+ clipInfo.endPos = clipInfo.startPos + d->duration();
+ clipInfo.cropStart = d->cropStart();
resizeClip(startInfo, clipInfo);
new ResizeClipCommand(this, startInfo, clipInfo, false,
true, moveCommand);
@@ -1384,18 +1385,18 @@ void CustomTrackView::editItemDuration()
new ResizeClipCommand(this, startInfo, clipInfo, false,
true, moveCommand);
}
- if (d.startPos() != clipInfo.startPos) {
+ if (d->startPos() != clipInfo.startPos) {
startInfo = clipInfo;
- clipInfo.startPos = d.startPos();
+ clipInfo.startPos = d->startPos();
clipInfo.endPos = item->endPos() + (clipInfo.startPos -
startInfo.startPos);
new MoveClipCommand(this, startInfo, clipInfo, true,
moveCommand);
}
- if (d.duration() > item->cropDuration()) {
+ if (d->duration() > item->cropDuration()) {
// duration was increased, so process it after move
startInfo = clipInfo;
- clipInfo.endPos = clipInfo.startPos + d.duration();
- clipInfo.cropStart = d.cropStart();
+ clipInfo.endPos = clipInfo.startPos + d->duration();
+ clipInfo.cropStart = d->cropStart();
resizeClip(startInfo, clipInfo);
new ResizeClipCommand(this, startInfo, clipInfo, false,
true, moveCommand);
@@ -1405,6 +1406,7 @@ void CustomTrackView::editItemDuration()
updateTrackDuration(clipInfo.track, moveCommand);
m_commandStack->push(moveCommand);
}
+ delete d;
}
} else {
emit displayMessage(i18n("Item is locked"), ErrorMessage);
--
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
